updated divs and show/hide function
Merge branch 'master' of https://github.com/whyu/PoolParty
minor updates
adding edit form view
resolved conflicts