fixed
Merge branch 'master' of https://github.com/jxionglim/AfterYouEMS

Conflicts:
	AfterYouEMS/__init__.pyc
	AfterYouEMS/settings.pyc
	AfterYouEMS/urls.pyc
	AfterYouEMS/wsgi.pyc
	CIS/__init__.pyc
	CIS/models.pyc
	CIS/urls.pyc
	CIS/views.pyc
	ESSS/__init__.pyc
	ESSS/models.pyc
	ESSS/urls.pyc
	ESSS/views.pyc
	IMS/__init__.pyc
	IMS/models.pyc
	IMS/urls.pyc
	IMS/views.pyc
	SAS/__init__.pyc
	SAS/ajax.pyc
	SAS/clienturls.pyc
	SAS/forms.pyc
	SAS/mgrurls.pyc
	SAS/models.pyc
	SAS/views.pyc