Merge branch 'master' of https://github.com/JCERTIFLab/jcertif-android-2013.git
Merge branch 'master' of https://github.com/JCERTIFLab/jcertif-android-2013.git