Major refactor
Merge branch 'master' of github.com:BlueHerons/GroupMe

Conflicts:
	party_bus_callback.php