Big update
Merge remote-tracking branch 'origin/master'

Conflicts:
	db_sql/geekspace_dev.sql
	jqm-head.php