no message
Merge branch 'master' of https://github.com/ssewardSolstice/Smart-Office-Android-Assets
Merge branch 'master' of https://github.com/ssewardSolstice/Smart-Office-Android-Assets