Merge pull request #26 from Sriii/master

master to hasan
Merge pull request #27 from Sriii/master

master to marc
Merge pull request #28 from Sriii/master

master to sri
Merge pull request #30 from Sriii/master

master to varshini
update
transfer manuals to folder
..
transfer brochures to folder
commit
upd
Merge pull request #31 from Sriii/Sri's-branch

sri to master
...
Merge pull request #35 from Sriii/Marc's-branch

Merge pull request #27 from Sriii/master
Merge pull request #36 from Sriii/Varshini's-branch

varshini to master
Merge branch 'master' into TeoHuei's-branch

Conflicts:
	Sales_Kit/_vti_cnf/master.dwt
	Sales_Kit/access_control/_vti_cnf/access_control.htm
	Sales_Kit/access_control/_vti_cnf/card.png
	Sales_Kit/access_control/_vti_cnf/fingerprintsuprema.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/BioEntryW_thumb.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/BioEntyPlus_thumb.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/BioStation_thumb.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/bioLiteNet_thumb.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/bioLiteSolo_thumb.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/biostationt2.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/d-station.jpg
	Sales_Kit/access_control/fingerprint/_vti_cnf/fingerprint.htm
	Sales_Kit/access_control/fingerprint/_vti_cnf/virdi.jpg
	Sales_Kit/contact/_vti_cnf/Hanman_Samsung_Digital_Door_Lock_Singapore_IMM.jpg
	Sales_Kit/contact/_vti_cnf/contact.htm
	Sales_Kit/digital_door_locks/_vti_cnf/DDL.htm
	Sales_Kit/digital_door_locks/_vti_cnf/deadbolt.jpg
	Sales_Kit/digital_door_locks/_vti_cnf/mortise.jpg
	Sales_Kit/digital_door_locks/_vti_cnf/rim.jpg
	Sales_Kit/digital_door_locks/deadbolt/_vti_cnf/3120.png
	Sales_Kit/digital_door_locks/deadbolt/_vti_cnf/3320.png
	Sales_Kit/digital_door_locks/deadbolt/_vti_cnf/3420.png
	Sales_Kit/digital_door_locks/deadbolt/_vti_cnf/deadbolt.htm
	Sales_Kit/digital_door_locks/deadbolt/manuals/SHS-3120_UserManual.pdf
	Sales_Kit/digital_door_locks/deadbolt/manuals/SHS-3121_UserManual.pdf
	Sales_Kit/digital_door_locks/deadbolt/models/3120.htm
	Sales_Kit/digital_door_locks/deadbolt/models/_vti_cnf/3120.htm
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/5021.png
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/5050.png
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/5120.png
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/6020.png
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/6120.png
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/SHS5230.gif
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/dl22.png
	Sales_Kit/digital_door_locks/mortise/_vti_cnf/mortise.htm
	Sales_Kit/digital_door_locks/rim/_vti_cnf/1321.JPG
	Sales_Kit/digital_door_locks/rim/_vti_cnf/2320.png
	Sales_Kit/digital_door_locks/rim/_vti_cnf/rim.htm
	Sales_Kit/images/_vti_cnf/bg.png
	Sales_Kit/images/_vti_cnf/hanman_transparent.png
	Sales_Kit/resources/_vti_cnf/resources.htm
	Sales_Kit/resources/digital_door_locks/deadbolt/brochures/_vti_cnf/SHS-3120-mortise.pdf
	Sales_Kit/resources/digital_door_locks/deadbolt/manuals/SHS-3121_UserManual.pdf
	Sales_Kit/resources/digital_door_locks/deadbolt/manuals/_vti_cnf/SHS-3121_UserManual.pdf
	Sales_Kit/smart_home/_vti_cnf/smart_home.htm
	Sales_Kit/styles/_vti_cnf/style2.css
	_vti_pvt/doctodep.btr
	_vti_pvt/linkinfo.btr
Merge pull request #41 from Sriii/master

master to teohuei