Test PNG-Overlay
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/js/controller/controller.js
..