test
Merge branch 'master' of https://github.com/ebaudimo/FrontEnd.git

Conflicts:
	ScheduleMaker/src/com/pedEdt/frontEnd/client/model/Teaching.java
	ScheduleMaker/src/com/pedEdt/frontEnd/client/view/MainGUI.java
	ScheduleMaker/src/com/pedEdt/frontEnd/client/view/ScheduleSemesterInformation.java