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