portswitch
Merge branch 'master' of https://github.com/mixbe/mediahackathon-regie

Conflicts:
	app/public/javascripts/controller.js