Major changes.
Merge branch 'master' of https://github.com/wlox/wlox-frontend into branded

Conflicts:
	htdocs/includes/head.php