Fixed URLs for HTTPS proxied tomcat server
Update links to other sites
Hide intro text after receiving voucher
Show error message if no more vouchers available
Merge branch 'master' into pilot

Conflicts:
	deploy.properties
Added mysql library
Merge branch 'master' into pilot