test
Merge branch 'master' of github.com:traviskuhl/bolt-auth

Conflicts:
	controllers/auth.php
	lib/auth.php
	lib/auth/provider/facebook.php
	lib/auth/session.php
workd