add option for bootstrapData to take JSON
Merge branch 'gh-pages' of https://github.com/JSlote/formbuilder into gh-pages
test commit