models.py ok tim 16.04
Merge branch 'master' of github.com:casparchen/SCPC-TS

Conflicts:
	application/models.py