...1.1.0.1
Merge branch 'master' of https://github.com/derdoktor667/TheMatrix_Android_App

Conflicts:
	.travis.yml