Removed unnecessary comments and imports
Merge branch 'master' of https://github.com/Schnuette/GrandmaApp.git