Moved categorised functions to test-only area
Updated tests to reflect categorised impact functions moved to test-only area
Merge branch 'master' of github.com:AIFDR/inasafe