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

Conflicts:
	js/all.min.js