That was just terrible - hanging offence tbh
Misc content changes + fixes
Fix the current view
Fix past too
Merge remote-tracking branch 'origin/develop'
Merge branch 'refs/heads/develop'
Merge branch 'master' of github.com:youngrewiredstate/rewiredstate-pyro-events
Fix a lex/parser call error
Merge branch 'develop' of github.com:rewiredstate/rewiredstate-pyro-events into develop
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge branch 'refs/heads/develop'
Merge branch 'master' of github.com:youngrewiredstate/rewiredstate-pyro-events

Conflicts:
	controllers/hacks.php
	views/admin/event_form.php
	views/view_current.php
	views/view_past.php
Beginning to get there!
Re-adding RS views, and some conditionals to support both websites
Fix for hack types
Fixing some admin issues
IP terms requirements
Extra fields
Merge branch 'develop' of github.com:rewiredstate/rewiredstate-pyro-events into develop

Conflicts:
	controllers/meets.php