abin
Merge remote-tracking branch 'origin/master'

Conflicts:
	SkillSmartUI/SkillSmartUI/MGMProfile.html