Merge pull request #6 from mateusz-szafraniec/master

updated build.xml
minor fixes - UI, code