TH-04 | BGM Functions
Merge branch 'TH-04' into dev1.0

Conflicts:
	application/config/database.php
	application/views/arena.php
	application/views/main/index.php
	assets/Data/Events/MAP001/EV005.json
	assets/Data/Events/MAP001/EV006.json
	assets/Data/Events/MAP001/EV007.json
	assets/scripts/jscripts.js