Tidied error handling for room forms
Removed destroy room id handler from generic handlers
Merge branch 'master' into roomconfig