Merge branch 'sequenzer' of github.com:Huel/BeatOut

Conflicts:
	.idea/workspace.xml
	out/production/BeatOut/BeatOut.apk
	out/production/BeatOut/BeatOut.swf
Merge branch 'master' into sequenzer