2: change a file
Merge branch 'master' of https://github.com/iexel/fontus-test.git

Conflicts:
	fontus-web/src/test/java/com/github/iexel/fontus/web/test/SpringMvcUnitTest.java