MX Player 1.7.28
XPrivacy 2.1.19

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Implement proper experimental check

Conflicts:
	META-INF/com/google/android/aroma-config
misc
ArchiKernel 1.2.1
BetterBatteryStats 1.16 RC5

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Add configurable build variant

Conflicts:
	__dont_include/build.sh
NickiToUpstream: Add support for non-CM repos

Conflicts:
	__dont_include/updaterepos.sh
NickiToUpstream: Derp
NickiToUpstream: Fix LF normalization
NickiToUpstream: XPrivacy 2.1.20
NickiToUpstream: BBS 1.16
NickiToUpstream: XPrivacy 2.1.21
NickiToUpstream: Remove CMHome as well

Conflicts:
	META-INF/com/google/android/updater-script

Conflicts:
	META-INF/com/google/android/updater-script
ArchiKernel V1.3

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Speedup flashing of AK a little
Silent boeffla app update
One does not simply make files world-writable when I rule

Conflicts:
	META-INF/com/google/android/updater-script
Remove GoogyMax kernel

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	META-INF/com/google/android/updater-script
Cleanup langs