More adds
Merge remote-tracking branch 'origin/master'

Conflicts:
	db_sql/geekspace_dev.sql
	events.php
	jqm-ggadmin.php
	jqm-ggmain.php
	jqm-ggmenucontrol.php
	jqm-ggnewevent.php