commit with issues fixes in user billing config and user feature config and layout addcourse step2
Merge branch 'master' of https://github.com/baabte/baabtra
commit with conflict fix

Conflicts:
	angularModules/course/partials/Partial-addCourse.html
	angularModules/course/partials/Partial-addCourse.js
	angularModules/course/partials/addCourseStep2.html
	angularModules/login/partials/Partial-home.js
	config.js