battle interface changes partly
updated branch, fixed conflict
TH-10 | Added settings button (logout and music control)
Merge branch 'TH-10' into dev1.0
modified th-09
fixed conflict
fix visibility due to merge conflict
updated gitignore
removed database and maps from git
TH-11 | Create layout for login and main menu
TH-09 | Level up stat point allocation
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
fix missing database file
updated gitignore
TH-11 | Modify login page
updated gitignore
Merge branch 'dev1.0' of https://github.com/fatimaPHP/titleholder into dev1.0
added db to gitignore
Merge TH-11 to dev1.0
Merge branch 'dev1.0' of https://github.com/fatimaPHP/titleholder into dev1.0