add favicon
get login working
merge master