fuck Spring MVC -> UI migrated to JSF
Merge remote-tracking branch 'origin/master'