Conflicts handling - merge with major UI branch
Code cleanup, link to home page fixed.
Merge pull request #3 from bancer/master

test