Preload tour images
Merge branch 'master' of github.com:stevenpetryk/europegrandtour

Conflicts:
	scripts/bubbles.js
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Add facebook button
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour

Conflicts:
	generic_header.php
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour
Merge branch 'master' of github.com:stevenpetryk/europegrandtour