Merge
Merge branch 'master' of https://github.com/palumir/flickoff

Conflicts:
	FD/bin/FD.apk
	FD/bin/classes.dex
	FD/bin/classes/com/DJG/fd/R$layout.class
	FD/bin/classes/com/DJG/fd/R$menu.class
	FD/bin/classes/com/DJG/fd/R$raw.class
	FD/bin/classes/com/DJG/fd/R$string.class
	FD/bin/resources.ap_
	appcompat_v7/bin/android-support-v7-appcompat.jar