old

Conflicts:
	Resources/public/js/script.js
Merge branch 'master' of https://github.com/netgen/LiveVotingBundle into HEAD
minor changes to footer and rates
scr
old1
msg
Merge branch 'master' of https://github.com/netgen/LiveVotingBundle into HEAD