Merge branch 'master' of https://github.com/zgthompson/pockwester

Conflicts:
	scripts/php/admin/insert.functions.php