Upload behaviour fix
Merge branch 'dev' of https://github.com/ZoofaDesign/ibadgeshop into dev

Conflicts:
	.gitmodules

	app/Plugin/Upload/