Merge branch 'master' of github.com:bcc0421/SmartData

Conflicts:
	SmartData/urls.py