i am committing my changes
Merge branch 'master' of https://github.com/baabte/baabtra
comminting logout,manage role modules

Conflicts:
	app.less
	config.router.pages.js
	index.html
Merge branch 'master' of https://github.com/baabte/baabtra
i am committing changes logout and manage company role
Conflicts:
	angularModules/company/partials/Partial-company_view.js
	bower_components/angular-xeditable/dist/css/xeditable.css