asd
Merge branch 'dev' of https://github.com/VizioArt/dock into dev

Conflicts:
	crestyl/app/repositories/Favourites/FavouriteRepository.php