Merge branch 'master' into development
travis config for development branch configurated; untestet
Merge branch 'development'