Merge branch 'master' of /Quantum/stgdjango with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
kay
kay