update - jihin
Merge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	angularModules/login/partials/Partial-home.js
	config.js
	index.html