cm-11-20140715-NIGHTLY-mako
Update updater-script, this new wipe-detection mechanism seems to be really interesting...!

Conflicts:
	META-INF/com/google/android/updater-script
misc
Nova Launcher 3.0.2

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

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

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

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Execute otasigcheck only on dirty flashes

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

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