update for cluster setup
Merge branch 'master' of https://github.com/lixun910/WebSDA-Django

Conflicts:
	myproject/database/geodata.sqlite
	myproject/myapp/templates/myapp/main.html