Messages interface refactoring.
Fixing AdministrationControllerTest
Fixing resource picker for messages.
Merge pull request #210 from ngodfraind/bugfix

Bugfix