Merge pull request #1 from mdluo/master

Merged from mdluo/scuol-android
Merge pull request #2 from scuol/master

Merge pull request #1 from mdluo/master