User, Group And Media Controllers wip
Merge branch 'develop' of https://github.com/cloverstudio/Spika-Server into develop

Conflicts:
	Vagrantfile
vagrantfile changes