Bug fixes for playing/stop playing logic
Merge commit 'e61924e6e5058f73704e546254ca3eec65189516'

Conflicts:
	services/DatingService.js