cm-10.2-20131028
Merge branch 'master' of github.com:jktools/CM10.2

Conflicts:
	Phone/res/values-ko/strings.xml
	version.txt