#2 check for disconnected instances
Merge remote-tracking branch 'origin/master'

Conflicts:

	webapp/src/com/naukma/cauliflower/controllers/ProceedOrderController.java
Merge branch 'master' of https://github.com/worm1k/OSS_Cauliflower