fix small bugs, change proguard cfg
Merge branch 'develop' of https://github.com/djj0809/MyCC98 into develop