Merge branch 'master' of http://210.51.45.41:3000/itcat_admin/aws_donenow

# Conflicts:
#	com.awspaas.user.apps.donenow_ivt/lib/com.awspaas.user.apps.donenow_ivt.jar
#	com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/controller/caiController.java