Auth
lib
Merge branch 'master' of https://github.com/interpegasus/gae_cms

Conflicts:
	.idea/workspace.xml
	projects/cms/.gaedata/datastore
	projects/cms/settings.py
	projects/cms/settings.pyc
	projects/cms/users/admin.pyc
	projects/cms/users/models.pyc