ArchiDroid Control app
HAVEGED: Updated to 1.9.1

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Misc preparations for ArchiDroid app
misc
General update

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Dnsmasq 2.69test8-10-g7b1eae4

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt