fixed .travis.yml
Create README.md
Merge branch 'master' into feature/1406-migration

Conflicts:
	.gitignore