Merge branch 'master' of https://github.com/kaplali/parkstorm into integration-tests
Merge branch 'master' of https://github.com/kaplali/parkstorm into integration-tests
Merge pull request #69 from kaplali/final_fix

Final fix
Fixes for personal map. Removed turbolinks
Merge branch 'master' of https://github.com/kaplali/parkstorm into personal-map-style
fix position of home button
make home button into a link
Merge branch 'master' of https://github.com/kaplali/parkstorm into final_fix
fixed reset password button
Merge pull request #70 from kaplali/personal-map-style

Personal map style
Merge branch 'master' of https://github.com/kaplali/parkstorm into bug_fixes
fix problems with formatting address
Merge branch 'master' of https://github.com/kaplali/parkstorm into final_fix
Merge pull request #71 from kaplali/bug_fixes

Bug fixes
Merge branch 'master' of https://github.com/kaplali/parkstorm into final_fix
add disclaimer