Merge origin/master

Conflicts:
	src/miina/Miina.java