Unit tests updated.
Unit test update
Conflicts handling - merge with major UI branch
Code cleanup, link to home page fixed.
Merge pull request #7 from bancer/master

Unit tests