Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/daeniristheforgotten/DaenirisTheForgotten.java