haml conversion WIP
updated bundle
fixed missing logout link
Merge branch 'master' into haml
updated bundle
fixed missing logout link
converted Pager Views
Merge branch 'haml'