sua
Merge remote-tracking branch 'origin/master'

Conflicts:
	DynamicPool/android/assets/conf/client.xml
	DynamicPool/android/assets/conf/server.xml

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/bll/BusinessLogicLayerImpl.java

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/dal/client/entity/Client.java

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/dal/processor/SynchoronousProcessor.java

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/dal/statics/EventType.java

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/events/CreateFishEvent.java

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/events/MoveOverEvent.java

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/events/ReceiveNewFishEvent.java

	DynamicPool/core/src/vn/edu/hust/student/dynamicpool/events/SynchoronousEvent.java