Merge cbt/master

Conflicts:
	application/views/template/modal.php
Merge cbt/master
Merge branch 'master' of https://github.com/terkmods/CBT.git
Merge cbt/master

Conflicts:
	application/views/template/modal.php