fixed error when setting type of a filter on save or update
add unit and integration tests, add method to FilterType to map from Strings
Merge branch 'master' of https://github.com/aodn/aodn-portal