Author Roza

Add js file in js
Merge branch 'master' of https://github.com/itc2014/vmallsco

Conflicts:
	general.html