Clean up bad formatting
Fix up database adapter
Don't force a controller to have a resource
Wokr on cluster monitor
Merge branch 'develop' of github.com:MicrosmartSA/ubiquity-commons into develop