4
6
Merge remote-tracking branch 'origin/master'

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