utf8
Merge branch 'master' of https://github.com/azekool/development.git

Conflicts:
	startproject/.settings/org.eclipse.core.resources.prefs