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

# Conflicts:
#	com.awspaas.user.apps.donenow_crm/lib/com.awspaas.user.apps.donenow_crm.jar

.gitignore

@@ -1,2 +1,4 @@
 com.awspaas.user.apps.donenow_ctt/lib/com.awspaas.user.apps.donenow_ctt.jar
 com.awspaas.user.apps.donenow_ivt/lib/com.awspaas.user.apps.donenow_ivt.jar
+com.awspaas.user.apps.donenow_sys/lib/com.awspaas.user.apps.donenow_sys.jar
+com.awspaas.user.apps.donenow_crm/lib/com.awspaas.user.apps.donenow_crm.jar