remove airtime-demo specific code
Merge branch '2.3.x' into 2.3.x-demo

Conflicts:
	airtime_mvc/application/controllers/UserController.php