Merge branch 'issue915'

Conflicts:
	application/controllers/admin/floor.php