modal changes
Merge branch 'master' of github.com:tourismwhistler/2014