fancy stuff
edit icon turns white
more css stuff
more css stuff
more css stuff
more css fixes
more css fixes
Merge branch 'master' of https://github.com/mapzen/poipond

Conflicts:
	app/views/pois/choose_category.html.haml
merge