added touch listener
Merge remote-tracking branch 'origin/master'

Conflicts:
	beatblender/src/main/java/com/beatblender/beatblender/MainActivity.java
	beatblender/src/main/res/layout/activity_main.xml