commit with user billing config and user feature config added angular schema form by arun
Merge branch 'master' of https://github.com/baabte/baabtra
fixing conflicts and adding fileupload

Conflicts:
	app.js
	bower.json
	index.html