AROMA: Add support for kernel + recovery combo (Xperia M)
build.sh: misc
sync.sh: Fix pagination problem
Misc manifest update
nicki: misc
Update hu.lang
Merge pull request #39 from ssiberia/patch-2

Update hu.lang
AROMA: Add support for colorspace (required for Xperia M)
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into master-cm
Add 480x854 images, misc fix to archi2
Add missing stock.png
PA GAPPS 7 December
ES File Explorer update
Enable development menu by default
del __build
Merge branch 'master-cm' of https://github.com/ArchiDroid/ArchiDroid into mako-cm-experimental

Conflicts:
	META-INF/com/google/android/aroma-config
	__build/_devices/720x1280/_archidroid/bootanimations/archi2/system/media/bootanimation.zip
	__build/build.sh
	__build/roomservice.xml
	__build/sync.sh