merge
Merge branch 'master' of https://github.com/davorb/sealcub into parallax

Conflicts:
	app/index.html
	app/scripts/bubbles.js