bla
bla
manufacture model and controller update
update
update
Merge branch 'duvid2'

Conflicts:
	GadgetStore/GadgetStore/obj/Debug/GadgetStore.csproj.FileListAbsolute.txt
.gitignore is now working
.gitignore is now working