Join projects
Merge remote-tracking branch 'origin/master'

Conflicts:
	Site_App/__pycache__/models.cpython-33.pyc
	Site_App/__pycache__/urls.cpython-33.pyc
	Site_App/__pycache__/views.cpython-33.pyc