Updated with proper branch/tag
Deployment fixes
Merge branch 'develop' of github.com:OS2web/os2web-deploy into develop

Conflicts:
	os2web.make