Add nicki to manifest
Update manifest
Add configurable build variant

Conflicts:
	__dont_include/build.sh
Update manifest, we're nearly here
NickiToUpstream: Add support for non-CM repos
NickiToUpstream: Use PhilZ recovery instead of CWM
NickiToUpstream: Derp
Update manifest

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

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