albums
Merge branch 'master' of https://github.com/nachodegrau/witbeat

Conflicts:
	src/Witbeat/MyAlbumsBundle/Resources/config/routing.yml