Merge branch 'master' of https://github.com/AndroidSFV/UMcS
Merge branch 'master' of https://github.com/CoZarctan/UMcS
Housekeeping
Merge branch 'master' into magboots