add ads back in
Merge branch 'develop' into ads

Conflicts:
	views/app/tasks.html
protocol agnostic ads
add username to tokens migration
Merge pull request #739 from Shaners/pets

Last Four Potions for New Pet System from Lemoness
Merge branch 'pets' of github.com:lefnire/habitrpg into pets
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
Merge pull request #10 from lefnire/pets

Update my Pets Branch