fix
merge
merge
Merge branch 'master' into mark

Conflicts:
	MARV/WebContent/WEB-INF/web.xml
	MARV/WebContent/home.jsp
	MARV/WebContent/inc/header.jsp
	MARV/WebContent/institution.jsp
	MARV/WebContent/list-institutions.jsp
	MARV/WebContent/unknown.jsp
	MARV/WebContent/user.jsp
	MARV/res/marv.sql
	MARV/src/com/marv/business/entities/DomainObject.java
	MARV/src/com/marv/persistence/core/PersistenceFacade.java
	MARV/src/com/marv/persistence/gateways/SignInCommand.java
	MARV/src/com/marv/persistence/mappers/AbstractMapper.java
	MARV/src/com/marv/persistence/mappers/AuctionItemMapper.java
	MARV/src/com/marv/ui/process/components/FrontServlet.java
	MARV/src/com/marv/ui/process/components/commands/ListInstitutionsCommand.java
	MARV/src/com/marv/util/operationalmanagement/ApplicationException.java
j