Issue #255, prevent control chars in user names and email addresses
Merge branch 'develop' of https://stellanl@github.com/akvo/akvo-flow.git into develop
Clean up last traces of the APK's arrays.xml instance dependency
Merge branch 'develop' of https://stellanl@github.com/akvo/akvo-flow.git into develop