Modified files for gitignore
 TH-04 | deleted EV and database
Merge remote-tracking branch 'origin/TH-09' into dev1.0
TH-09 | Enhance battle module
TH-09 | Remove Events and Database from Git cache
Merge branch 'TH-09' of https://github.com/fatimaPHP/titleholder into TH-09
TH-14 | Modify Event Generation
Fix Merge TH-09 to dev1.0
Merge branch 'dev1.0' of https://github.com/fatimaPHP/titleholder into dev1.0
TH-09 | Fix battle result animation
TH-09 | Enhance HP bar
 TH-09 | battle effects
Merge branch 'TH-09' of https://github.com/fatimaPHP/titleholder into TH-09

Conflicts:
	application/views/main/index.php
	assets/scripts/jscripts.js
 TH-09 | hp adjust
Merge branch 'dev1.0' of https://github.com/fatimaPHP/titleholder into dev1.0
Merge branch 'TH-09' of https://github.com/fatimaPHP/titleholder into dev1.0
Merge TH-14 to dev1.0
Merge branch 'dev1.0' of https://github.com/fatimaPHP/titleholder into TH-04

Conflicts:
	assets/Data/Events/MAP001/EV006.json
	assets/Data/Events/MAP001/EV007.json