Merge pull request #2 from manelscout4life/jellybean

Get ready for official support
move loki to msm8960-common

Change-Id: I2293a9472988def61c2c6cc9242ce8f31d708863
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_device_samsung_jflteatt into jellybean