branches,add menu by jihin
fixed conflicted files
Merge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	angularModules/login/services/Service-home.js
	app.js
	app.less
	bower.json
	bower_components/template/dist/customstyles.css
	index.html