Added missing libraries to make file.
Updated contrib versions.
Merge branch 'develop'

Conflicts:
	os2web_frontend.make