Update inotifytools

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
INIT: Be less harsh towards wipes
INIT: Improve stability
Silent boeffla app update
Adflash code review

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
misc
Adgithub code review
EXPERIMENTAL: Hardswap support [WIP]

Conflicts:
	META-INF/com/google/android/aroma-config
AROMA: Use var in paths

Conflicts:
	META-INF/com/google/android/aroma-config
AROMA: Move hardswap to proper block
AROMA: Previous expert mode (WIP)
INIT: Hardswap implementation
misc
Update ArchiDroid Init.d
PhilZ Touch 6.41.6

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

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
App Settings 1.9
XPrivacy 2.0.22

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