BadMerge with bugs.
Flashing ToolLights.
Layout Abstraction.
Layout Abstraction.
Merge remote-tracking branch 'origin/master' into Nathalie

Conflicts:
	app/apk/app-debug-unaligned.apk
	app/apk/app-debug.apk
Beacon graph fully functional,
Sounds also kinda working