Removes cached /tmp files that shouldn't be tracked.
Deletes misnamed .html script file and old admin.ctp page.

Conflicts:
	beta/app/Lib/tasks/db_load_villages_hawkhost.php
Changes error emails to be sent to support, not site.
Changes user lookup in plan display to abstract out the SQL.
Cleans up the old admin view pages.
Removes old commented-out return debugging line.
Initial implementation of a pseudo admin login function.
Adds empty /tmp folder.
Adds new beta 2.0 logo.
Clears cached /tmp files that shouldn't be tracked.

Conflicts:
	beta/app/tmp/logs/error.log
Fixes merge conflict.

Conflicts:
	public_html/app/Controller/UsersController.php
Fixes merge conflict.
Fixes news links on index page.

Conflicts:
	public_html/app/View/Pages/index.ctp
Syncs /beta folder with the changes made on live.