Merge origin/master

Conflicts:
	credit.txt
	src/engine/ImageLoader.java
Merge origin/master