ocmmit
Merge branch 'master' of https://github.com/OldGuo/DAP2013.git

Conflicts:
	DAP2013/src/MyTableModel.java
	DAP2013/src/ParticipantPanel.java
	DAP2013/src/ParticipantRegistrationWindow.java
	DAP2013/src/WorkshopPanel.java