Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Fixed small CSS changes on description page and user page
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #174 from LasseSviland/master

	made categories sorted
Merge branch 'master' of https://github.com/cicadas-2014/Embark
Merge pull request #175 from JessicaTatham/master

	Fixed small CSS changes on description page and user page
changes to user css
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Made it so that global search doesn't require location
Redirects user to global if no location is given
Merge pull request #176 from JessicaTatham/master

Made it so that global search doesn't require location
fix favorite bug
Merge pull request #177 from DineshRai/favorite_button_fix

fix favorite bug
changed css on 3rd page
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #178 from jasonMatney/jason

change 3rd page css
updated user page
Merge pull request #179 from jasonMatney/jason

updated user page
Merge pull request #180 from LasseSviland/master

updated adventure controller