ES File Explorer update
Enable development menu by default
AROMA: Misc
AROMA: Enable all densities by default, devices should declare only proper ones
Update nl.lang
Merge pull request #41 from Pittvandewitt/patch-1

Update nl.lang
Add initial zh_CN.lang file

and need to be translated.
zh_CN: finish Simplified Chinese translation

I will modify if needed.
zh_CN: misc
Merge pull request #42 from wongsyrone/master-cm

zh_CN: add Simplified Chinese translation
AROMA: Add zh_CN.lang
AROMA: Misc
Adblock: Fix DNSMonitor being active with disabled adblock
Adblock: Fix broken route after disabling adblock
WIP: Adblock: Make dnsmasq optional
Adblock: Correct notifier
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into i9300-cm-experimental

Conflicts:
	META-INF/com/google/android/aroma-config