Added some comments
Some imports
Merge branch 'master' of https://github.com/knr1/ch.bfh.mobicomp.git
Some imports