Bring votes to front
Merge branch 'master' of https://github.com/bartosz-grabski/2014euhackaton

Conflicts:
	web/static/js/controllers/DashboardController.js
	web/views/dashboard.html