Merge branch 'jc'

Conflicts:
	.DS_Store
	empirebt/.DS_Store
	empirebt/main/models.py
	empirebt/main/views.py
	empirebt/urls.py
Merge branch 'master' into hector

Conflicts:
	.DS_Store
	empirebt/.DS_Store
	empirebt/main/models.py
	empirebt/main/views.py
	empirebt/urls.py