cm-11-20140804-NIGHTLY-mako
Remove BBS

Conflicts:
	META-INF/com/google/android/aroma-config
	META-INF/com/google/android/aroma/_changelog.txt
	META-INF/com/google/android/aroma/thirdparty.txt
	META-INF/com/google/android/updater-script
	_archidroid/apps/betterbatterystats/system/priv-app/BBS.apk

Conflicts:
	META-INF/com/google/android/aroma-config
	META-INF/com/google/android/aroma/_changelog.txt
	META-INF/com/google/android/aroma/langs/al.lang
	META-INF/com/google/android/aroma/langs/cr.lang
	META-INF/com/google/android/aroma/langs/da.lang
	META-INF/com/google/android/aroma/langs/de.lang
	META-INF/com/google/android/aroma/langs/dummy.lang
	META-INF/com/google/android/aroma/langs/el.lang
	META-INF/com/google/android/aroma/langs/en.lang
	META-INF/com/google/android/aroma/langs/es.lang
	META-INF/com/google/android/aroma/langs/fa.lang
	META-INF/com/google/android/aroma/langs/fi.lang
	META-INF/com/google/android/aroma/langs/fr.lang
	META-INF/com/google/android/aroma/langs/hu.lang
	META-INF/com/google/android/aroma/langs/it.lang
	META-INF/com/google/android/aroma/langs/nl.lang
	META-INF/com/google/android/aroma/langs/pt.lang
	META-INF/com/google/android/aroma/langs/ru.lang
	META-INF/com/google/android/aroma/langs/tr.lang
	META-INF/com/google/android/aroma/langs/zh_CN.lang
	META-INF/com/google/android/aroma/thirdparty.txt