conflict
Merge branch 'master' of https://github.com/OT-SIMS-2013/android.git
Merge branch 'master' of https://github.com/OT-SIMS-2013/android.git
BitmapManager