fedf
Merge branch 'master' of https://github.com/staafl/team-azure-dragon
Merge branch 'master' of https://github.com/staafl/team-azure-dragon
Fix administration errors and change dictionary model to viewmodel to fix sorting