Fix Image
tMerge branch 'master' of https://github.com/BinaryBrain/MonsterFriends

Conflicts:
	app/static/js/get_user_details.js
Merge branch 'master' of https://github.com/BinaryBrain/MonsterFriends
Merge branch 'master' of https://github.com/BinaryBrain/MonsterFriends