Merge remote-tracking branch 'origin/TH-09' into dev1.0
Merge branch 'dev1.0' of https://github.com/fatimaPHP/titleholder into dev1.0
 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