Clean up controller a bit
Merge branch 'master' of https://github.com/christofmuc/birdminer

Conflicts:
	birdminer-backoffice/scripts/controllers.js