Version Bump
Merge branch 'master' of github.com:tendenci/tendenci

Conflicts:
	tendenci/__init__.py