Merge origin/master

Conflicts:
	src/calogerusdraconis/Consumable.java
	src/calogerusdraconis/Main.java
	src/calogerusdraconis/Store.java
	src/calogerusdraconis/UserDragon.java
Merge origin/master