c1
c2
c3
c4
c5
Merge branch 'b1'

Conflicts:
	fontus-web/src/test/java/com/github/iexel/fontus/web/test/SpringMvcUnitTest.java
c6
c7
c8
Merge branch 'b1'

Conflicts:
	fontus-web/src/test/java/com/github/iexel/fontus/web/test/SpringMvcUnitTest.java
cr 1
m1
a1
a2
m5
b1
b2
b3
b4