Set base URL based on servlet path
Merge remote-tracking branch 'origin/master' into fix-travis

Conflicts:
	web/WEB-INF/views/layoutHeader.ftl