#
Merge remote-tracking branch 'origin/master'

Conflicts:
	store/templates/search_user.html