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