Merge origin/master

Conflicts:
	src/mergeproject/MergeProject.java
Merge origin/master

Conflicts:
	src/mergeproject/MergeProject.java