Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/AssetManagers/VariablesLibrary.java
	core/src/com/manbow2/Enemy.java