Profile image issue on fixing
Merge remote-tracking branch 'origin/master'

Conflicts:
	anbadoserver/static/thinkGenerate.js