upload image frontend
Merge remote-tracking branch 'origin/master'

Conflicts:
	FulaDjur/Scripts/_references.js