Scenes angular gedoe & hele hoop geprobeer met css ugh
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/javascripts/controllers.js