More merge futzery!
Merge branch 'master' of github.com:MaxAlex/Projectsync
What.