UploadView Update
Merge branch 'master' of https://github.com/zian92/Glurak

Conflicts:
	SProject/database/Glurak.lck
	SProject/database/Glurak.properties
	SProject/database/Glurak.script