Merge pull request #152 from lilfade/master

Changes to upgrade system and other minor fixes for git commits.
Merge branch 'master' of https://github.com/alexweissman/UserFrosting