added timeouts
preparing to switch to html geolocation
closes #71
closes #71
closes #70
added bootstrap-switch
cleaned up code and prepared app template
closes #67 and more android-app friendly
closes #72
closes #73
before changing time widgets
closes #39
again on timepicker
closes #64
closes #75
Merge branch 'master' into deploy

Conflicts:
	marcopolo/templates/base.html