editor and testing changes
Merge branch 'master' of https://github.com/DanielLagin/TIS_2013

Conflicts:
	application/controllers/testing.php