-fix infinite loop on invalid files
fix missing import
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
Merge branch '2.3.x' into devel
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
disable deletion of users
remove airtime-demo specific code
Merge branch '2.3.x' into devel

Conflicts:
	airtime_mvc/application/controllers/UserController.php