training changes. view and scss
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	public/js/app/user/modules/trainings/single.stache
training changes. view and scss