Test commit 1.
test 2
Merge branch 'my-branch1'

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