update
Merge branch 'master' of https://github.com/vOneShot/What-Happened-Where

Conflicts:
	admin/ajaxCRUD.class.php
	admin/css/badicon.gif
	admin/css/checkicon.gif
	admin/css/cuscosky.css
	admin/css/default.css
	admin/css/fieldbg.gif
	admin/css/loading.gif
	admin/javascript_functions.js
	admin/preheader.php
	admin/validation.js
	index.php