Merge remote-tracking branch 'origin/master'

Conflicts:

	paranormalGolf/app/src/main/java/mini/paranormalgolf/Graphics/DrawManager.java