Merge branch 'master' of https://github.com/lariusz/hotboobies

Conflicts:
	Prog_wsp/.classpath
	Prog_wsp/.project
Merge branch 'master' of https://github.com/lariusz/hotboobies

Conflicts:
	Prog_wsp/.classpath
	Prog_wsp/.project