Merge remote-tracking branch 'origin/master' into Nathalie
Signal Beacon Custom View
Signal Beacon frame rate fixed
Biocalibrate skinning bug fixed
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Amplifier.java
	app/src/main/java/ca/mixitmedia/ghostcatcher/app/Tools/Biocalibrate.java