Merge branch 'master' of github.com:yeleman/SNISI-droid
Progress check
Merge branch 'master' of github.com:yeleman/SNISI-droid