Merge pull request #1 from WOYM/master

Update
GUI-Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/woym/controller/manage/TeacherController.java
Updated GUI-Prototype
Fixed Version
Merge pull request #16 from tihansen/master

Added GUI-Controller