workoutpage

after video player and timer add
show workout

show workout
PNotify & SideNavigation & ajax Friend Added

PNotify & SideNavigation & ajax Friend Added
Merge branch 'master' of https://github.com/virtualgym/virtual

Conflicts:
	.idea/workspace.xml
	config/locales/en.yml
	config/locales/fa.yml
A

A