Layout stuff for THIS ROUND and maths
Merge branch 'development' of https://github.com/danthaiwang/cuprun into development

Conflicts:
	bin/php/controller/debuglogin/forcelogin.php
	bin/php/view/navbar.php