Improved how content is displayed dynamically
Merge branch 'master' of github.com:basilesimon/EU-elections-2014
Merge branch 'master' of github.com:basilesimon/EU-elections-2014

Conflicts:
	public/js/main.js
Fix broken merge (oops)