i003_z003
i003_z003
Merge branch 'i003_z003' of http://github.com/bbsszz/freendime into i003_z003

Conflicts:
	freendime/__init__.pyc
	freendime/login/__init__.pyc
	freendime/login/models.pyc
	freendime/login/views.pyc
	freendime/main/__init__.pyc
	freendime/main/models.pyc
	freendime/main/views.pyc
	freendime/registration/__init__.pyc
	freendime/registration/models.pyc
	freendime/registration/views.pyc
	freendime/settings.pyc
	freendime/shared/__init__.pyc
	freendime/shared/messages.pyc
	freendime/urls.pyc
	freendime/wsgi.pyc
fix for i003_z003
Merge branch 'i003' of http://github.com/bbsszz/freendime into i003_z003

Conflicts:
	freendime/main/templates/main.html
fix for i003_z003