Merge branch 'master' of https://github.com/alexweissman/UserFrosting

Conflicts:
	models/funcs.php - captcha issues