Merge origin/master

Conflicts:
	src/java/controller/Name.java