some more reefactoring in FavoritesService
Merge branch 'angular' of https://github.com/SchizoDuckie/DuckieTV into angular

Conflicts:
	js/services/FavoritesService.js