our
h
cxcx
Merge branch 'master' of https://github.com/solargiant/fax-app/

Conflicts:
	fax/src/main/resources/config/spring/spring-fax.xml
	fax/src/main/webapp/WEB-INF/spring-mvc-servlet.xml