Merge pull request #1 from svaleri11/master

Merge latest commits
Cleaned up code
Merge branch 'master' of https://github.com/pcas00/productivity
Google Login and project cleanup
Fixed merge conflicts