Rebel
Merge branch 'master' of https://github.com/bartosz-grabski/2014euhackaton
Change dashboard look
Merge branch 'master' of https://github.com/bartosz-grabski/2014euhackaton

Conflicts:
	web/static/css/main.css