refactor
refactor. added the test for $builderProvider.convertFormObject()
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dist/angular-form-builder.js
	dist/angular-form-builder.min.js
	src/provider.coffee