add ads back in
Merge branch 'develop' into ads

Conflicts:
	views/app/tasks.html
protocol agnostic ads
pets: remove unecessary css
and include email in apply_tokens
fix tokens migration script
Merge branch 'ads' into pets
pets: rename base.name to from "Common" to "Base" for technical reasons
pets: list cost of items in market
better wording on buying tokens