Merge remote-tracking branch 'refs/remotes/origin/master' into directive

Author: ThomasPe

README.md

@@ -1,20 +1,29 @@
-# Json Schema Form Builder
+# Schema Form Builder
 
+A simple form builder that generates a schema and form based on the [angular schema form](http://schemaform.io) package.
+
+<<<<<<< HEAD
+=======
 (branch for directive development)
 
 Quickly generate your your schema form using this GUI builder.
+>>>>>>> refs/remotes/origin/directive
 
 # Roadmap
 
 - Complete support of all elements based on schema-form
+<<<<<<< HEAD
 - Support for editing existing Schemas & Forms
 - Provide source definition for different platforms
 - 100% test coverage
 
+<<<<<<< HEAD
+=======
 <<<<<<< HEAD
 # Demo
 There is a live demo at http://ralphowino.github.io/schema-form-builder
 =======
+>>>>>>> refs/remotes/origin/directive
 
 
 #Basic Usage
@@ -47,7 +56,15 @@ Then load them into the Schema Form Builder using the `sfbSchema` and `sfbForm`
 </div>
 ```
 
+<<<<<<< HEAD
+=======
 >>>>>>> refs/remotes/origin/master
+>>>>>>> refs/remotes/origin/directive
 
 # Simply need a html form?
-To generate vanilla/bootstrap/material forms check out ralphowino.github.com/form-builder
+To generate vanilla/bootstrap/material forms checkout ralphowino.github.com/form-builder
+=======
+- Generate vanilla/bootstrap/material forms
+
+Built By: [ralphowino.com](http://ralphowino.com)
+>>>>>>> parent of 81af0ee... update builder