Integrated gae-simpleauth module
Initial integration of simpleAuth
Merge branch 'master' of github.com:aaronlifshin/whysaurus

Conflicts:
	base.html