Small changes to the way upgrade system works so it dont get auto called on initial install, need to add in a check for the acp so this can only be accessed by admin and only should run when called.
Merge branch 'master' of https://github.com/alexweissman/UserFrosting

Conflicts:
	models/funcs.php
Merge branch 'master' of https://github.com/alexweissman/UserFrosting

Conflicts:
	models/funcs.php - captcha issues
Merge pull request #152 from lilfade/master

Changes to upgrade system and other minor fixes for git commits.
Merge pull request #2 from alexweissman/master

pulling in latest commit