Updates for test

..
Merge branch 'master' of https://github.com/SimonTakman/TDA367

Conflicts:
	.gitignore
	Mouseophonic/.idea/libraries/Gradle__19_0_1.xml
	Mouseophonic/.idea/libraries/Gradle__MouseophonicCrossPlatform.xml