Fix faulty sorting functions
Issue #389 - UI strings for user warning to save survey
Merge branch 'develop' of https://github.com/akvo/akvo-flow into develop