Merge branch 'master' of https://github.com/NiceScale/angular-schema-form into NiceScale-master

Conflicts:
	README.md

Author: davidlgj

README.md

@@ -3,6 +3,13 @@ Angular Schema Form
 
 Generate forms from a JSON schema, with AngularJS!
 
+### [Try out the example page](http://textalk.github.io/angular-schema-form/src/bootstrap-example.html)
+...where you can edit the schema or the form definition and see what comes out!
+
+
+What is it?
+----------
+
 Schema Form is a set of AngularJS directives (and a service..) that can create a form directly from a json schema
 definition and also validate against that schema. The defaults may be fine for a lot cases, but you can also
 customize it, changing order and type of fields.
@@ -18,10 +25,6 @@ Another thing that sets Schema Form apart is that it, at the moment, doesn't imp
 does, nor have any documentation! Which of course we hope to remedy soon.
 
 
-Try out the [example](http://textalk.github.io/angular-schema-form/src/bootstrap-example.html) where you can edit
-the schema or the form definition and see what comes out!
-
-
 Basic Usage
 -----------
 
@@ -312,7 +315,7 @@ the ```sf-schema``` directive.
 
 ### radios and radiobuttons
 Both type *radios* and *radiobuttons* work the same way, they take a titleMap
-and renderes ordinary radio buttons or bootstrap 3 buttons inline. It's a
+and renders ordinary radio buttons or bootstrap 3 buttons inline. It's a
 cosmetic choice.
 
 Ex.

bower.json

@@ -1,5 +1,9 @@
 {
   "name": "angular-schema-form",
+  "main": [
+    "dist/schema-form.min.js",
+    "dist/bootstrap-decorator.min.js"
+  ],
   "version": "0.0.4",
   "authors": [
     "Textalk",