Merge origin/master

Conflicts:
	src/calogerusdraconis/Dragon.java
	src/calogerusdraconis/UserDragon.java
Merge origin/master