Final
Merge branch 'master' of https://github.com/agrubi/bored_minutes

Conflicts:
	app/view/picture/PictureCanvas.js