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

Conflicts:
	config.router.pages.js
Merge branch 'master' of https://github.com/baabte/baabtra
update by jihin
add course step 2 by jihinMerge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	angularModules/course/partials/Partial-course.js
	angularModules/course/partials/addCourseStep2.html
	index.html
Merge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	Wireframes/Add_Course/add_Course.ep
add course step 2 by jihin
add course step 3 by jihin