UI changes
UI changes
test
Conflicts solved
Merge branch 'master' of https://github.com/MarioStoilov/TeamZorro