Exclusively Tomasz' work!

I'm happy I'm allowed to commit it
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/src/main/webapp/pages/placeAd.jsp