changing to image load.
Merge branch 'heroku'

Conflicts:
	app/frontend/bookmarklet/index.js
adding button for switch.