aokp: World Phone Support

Change-Id: I1416a4eb3591deda59a122dbdcb57f2796e345d9
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
AOKP: Add AOKP_BRANCH to nightly and unofficial aokp.version's

* For flashers sake

Change-Id: Ifb0ec0c64da118a19ff377f3ed67bfa60e9a95d6
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2

Conflicts:
	configs/common_versions.mk