shortcuts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	core/src/com/profiletailor/game/Assets.java
	core/src/com/profiletailor/game/CategoriesBox.java
	core/src/com/profiletailor/game/ViewBox.java
...
Revert "shortcuts"

This reverts commit 93eefcb3fbbf3739d6de9d2e59f5db25846c703a.

Conflicts:
	core/src/com/profiletailor/game/Assets.java
	core/src/com/profiletailor/game/CategoriesBox.java
	core/src/com/profiletailor/game/ViewBox.java
conflict fix
merge conflicts resolved

OK