Using current time for image upload
Merge branch 'jmp_ctrl' into testing

Conflicts:
	CTRL/CaPSLOC/Scripts/capsloc/createscript.js