loading resource data from database, more GUI work
Merge branch 'dev' into staging
Merge branch 'staging'