jos
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/sivitsky/ruslan/web/WelcomeController.java
Translator