Merge branch 'master' of https://github.com/mixbe/kerstkaart2014

Conflicts:
	app/public/img/snowpx.png
Merge branch 'master' of https://github.com/mixbe/kerstkaart2014