Working bash script
Merge branch 'master' of https://github.com/blackradley/moelydd.git

Conflicts:
	web_app/scripts/development_server.sh