add v1beta15 support to fractalfix branch (while waiting for pull request
to be included in master branch)
fix to avoid derefing start from undefined timer prop, and fixed
reference to undefined Recovering flag
Merge branch 'master' of https://github.com/GoogleCloudPlatform/compute-appengine-demo-suite-python into fractalfix

Conflicts:
	demo-suite/settings.json
updated version
revert to branch specific version
Merge branch 'master' of https://github.com/GoogleCloudPlatform/compute-appengine-demo-suite-python into fractalfix
switch to version 1 in prep for merging to master branch
modified main.py for quick-start to set zone for both instance
and machine type from user specified config setting
Merge branch 'master' of https://github.com/GoogleCloudPlatform/compute-appengine-demo-suite-python into fractalfix

Conflicts:
	demo-suite/static/js/gce.js
Merge pull request #10 from GoogleCloudPlatform/fractalfix

upgrade fractal demo to v1beta15 (and other misc fixes)