Version_0.4
Merge remote-tracking branch 'origin/master'

Conflicts:
	myCoachAPI/public/softedge-admin.html
Version_0.4