popr
Merge branch 'master' of https://github.com/gibu/hackDay2013

Conflicts:
	app/controller/Main.js
	conf.js
	resources/css/custom.css
Merge branch 'master' of https://github.com/gibu/hackDay2013

Conflicts:
	app/controller/Main.js