commit
Merge branch 'master' of https://github.com/CedDev/WorldCup2014

Conflicts:
	app/scripts/controllers/worldcup.js
	app/views/partials/statistic.html
	app/views/partials/worldcup.html