router added, need to secure /#admin
merge with master
logout link
Merge branch 'master' into gh-pages