saman add ip&connect
take photo for IP camera
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ir/university/toosi/tms/model/entity/zone/Camera.java
saman add ip&connect
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
saman add ip&connect