cross-platform resizing Canvas
Merge branch 'master' of https://github.com/mixbe/kerstkaart2014

Conflicts:
	app/public/images/bol_f.png