new layout

still leader board bug
Merge branch 'master' of https://github.com/CVMIG/Malaria-Server

Conflicts:
	crowd/templates/crowd/dashboard.html