Merge branch 'master' of https://github.com/rubenkostucki/nomnivor
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:rubenkostucki/nomnivor
Merge branch 'master' into develop