Fail Lars
Fixed merge
Added reset button, added extended skin to tree view
Fixed merge conflict