Merge branch 'master' of https://github.com/stacksBundles/geoSports

Conflicts:
	collabit/settings.pyc
	directory/forms.pyc
	directory/models.pyc
	directory/static/js/FX.js
	directory/templates/index.html
	directory/views.pyc