-Bug fixing
Merge branch 'NBS_PersonalTab' of https://github.com/open-learning-exchange/BeLL-Apps into NBS_PersonalTab

Conflicts:
	attachments/nation/app/Router.js
Merge branch 'NBS_PersonalTab' of https://github.com/open-learning-exchange/BeLL-Apps into NBS_PersonalTab