Revert "//"

This reverts commit 4bdd4fe903f90892f1ca86b68bd13dd480e1fd0d.

Conflicts:
	Classes/CustomMenuSprite.cpp
	Classes/CustomMenuSprite.h
Revert "Revert "//""

This reverts commit 59310421825116b4187109f7e889e17ecf04ce38.
Merge remote-tracking branch 'origin/master'