i am committing changes in login
committing changes in loginMerge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	angularModules/course/partials/Partial-addCourse.html
	angularModules/course/partials/Partial-addCourse.js
	angularModules/feature/partials/Partial-feature_config.js
	bower_components/template/dist/customstyles.css
	config.js
	index.html