Merge branch 'develop' of https://git.trustie.net/haozhou/app

# Conflicts:
#	文档/软件需求规格说明书.doc
#	模型/robocode机器人战斗模拟——软件模型.vsdx

代码/workspace_robo4/LICENSE.txt

@@ -1,14 +0,0 @@
-Robocode is licensed under the Eclipse Public License v1.0 (EPL), which is available at
-http://robocode.sourceforge.net/license/epl-v10.html
-
-Notable exceptions are:
------------------------
-
-Ant and Maven tools:
-- Files/tools located under the directory /tools/bin are licensed under the Apache Software Foundation (Apache-2.0):
-  http://www.apache.org/licenses/LICENSE-2.0.html
-  The license files for the Ant and Maven tools are provided under the /tools/licenses directory.
-
-CILReader.cs:
-- The file /plugins/dotnet/robocode.dotnet.nhost/src/mono/reflection/CILReader.cs is copyrighted (C) 2009 Novell, Inc.
- (http://www.novell.com)