changes in commonervice
committing changes
resolved changedMerge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	angularModules/login/controllers/Controller-header.js
	config.js