merge fix
changed way of presenting users + adding script to update users xml file
minor fix in imports
style changes
Merge pull request #5 from piotr-mazurek/bug_2538

Bug 2538