lalajaradila
lalarge branch 'master' of https://github.com/netgen/LiveVotingBundle

Conflicts:
	Resources/public/css/style.css