fixed control in lightbox
Merge branch 'master' of github.com:nickfreeman/scratchpaper

Conflicts:
	app/assets/javascripts/application.js