added button to return to project from map, #1360
minor commit repair
added jq cookie to keep settings box open after submit, issue #1357
Merge branch 'master' into ui-fixes
Update show.html
Merge pull request #33 from kobotoolbox/ui-fixes

Ui fixes for #1357 and #1360