work with calendar
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/userProfile/userProfile.scala.html
add functionality btn-start and stop for admin
refactoring with avatars for users