Fix network for good
Cool Tool 5.4.1

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
GravityBox 3.1.1
PA GAPPS 2604
Update inotifytools
PA GAPPS 3 May

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Move FaceUnlock to core
INIT: Be less harsh towards wipes
INIT: Improve stability
Bump to 2.4.5

Conflicts:
	META-INF/com/google/android/aroma-config
	META-INF/com/google/android/aroma/_changelog.txt
	__dont_include/build.sh
	_archidroid/ota/ota.sh
Adflash code review

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	_archidroid/auto/system/bin/adflash
Adgithub code review

Conflicts:
	_archidroid/auto/system/bin/adgithub
EXPERIMENTAL: Hardswap support [WIP]
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
PA GAPPS 13 May

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