Merge remote-tracking branch 'refs/remotes/json-schema-form/master'

# Conflicts:
#	README.md

Author: ThomasPe

app/index.html

@@ -16,7 +16,7 @@
 
   <div ng-controller="FormBuilderController">
     <a class="btn btn-sm btn-primary pull-right" ng-click="newForm()">New Form</a>
-    <div sfb-schema="schema" sfb-form="form" sfb-model="model"></form>
+    <div sfb-schema="schema" sfb-form="form" sfb-model="model"></div>
     </div>
   </div>