Merge branch 'master' into integratingFormBuilder
Merge branch 'integratingFormBuilder' of https://github.com/nelsonomuto/angular-ui-form-validation into integratingFormBuilder
adding required marker
fixed build error, removed unloaded dependency - progressbar from app
Merge branch 'master' into integratingFormBuilder
resolved plugin to only one dependency
resolved plugin to only one dependency
resolved plugin to only one dependency
Merge branch 'master' into integratingFormBuilder

Conflicts:
	app/scripts/app.js

merging master resolving plugin to one dependency for validation - customValidatio
nTypes
dependency added
Merge branch 'master' into integratingFormBuilder
only testing on node 0.10 in travis ci build moving forward
Merge branch 'master' into integratingFormBuilder