fixed css on login/logout pages
add favicon image to layout view
solve merge conflicts
Merge pull request #75 from tiger-swallowtails-2013/edit_view_again

Edit view again