Version_v0.0.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	myCoachAPI/public/softedge-admin.html
Version_v0.0.1
Version_v0.0.2