Porting finished
Merge branch 'master' of https://github.com/piciuoka/cafe

Conflicts:
	Cafe/src/cafe/gui/MainWindow.java