Sidyo
Merge remote-tracking branch 'origin/master'

Conflicts:
	beatblender/src/main/java/com/beatblender/beatblender/MainActivity.java
sr1
Merge remote-tracking branch 'origin/master'