Trying out automatic travis ci image
Merge branch 'develop' into feature/User