updated for android
Merge branch 'master' of https://github.com/kony/KonyNoteBook