committing configuration and billing plan modules
Merge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	config.router.pages.js
	index.html