Merge pull request #165 from JessicaTatham/master

Fixed CSS for user home page and fixed favorites button so user homep…
made sorting by continget work right, and updated filters
fixed merge conflicts
Merge pull request #166 from LasseSviland/master

made sorting by continget work right, and updated filters
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Fixed merge conflict and fixed spacing on user page