.
Merge branch 'master' of https://github.com/pedja1/SMC-Android.git