make our user of other api generic
Merge branch 'master' into generalize_otherapi

Conflicts:
	hogwarts/marauder/templates/experience.html
Merge pull request #434 from Kae7in/generalize_otherapi

make our user of other api generic