Login box stuff

And a few bits of random things/stuff/crap.
Merge branch 'master' of https://github.com/AgentTadpole/418-Teapots

Conflicts:
	app/includes/nav.php