Merge branch 'master' of https://github.com/huazonglin/java

Conflicts:
	design/UML/Notification Activity Diagram.asta
Merge branch 'master' of https://github.com/huazonglin/java

Conflicts:
	design/UML/Notification Activity Diagram.asta