Merge remote-tracking branch 'origin/master'

Conflicts:

	paranormalGolf/app/src/main/java/mini/paranormalgolf/Graphics/DrawManager.java
	paranormalGolf/app/src/main/java/mini/paranormalgolf/Physics/Ball.java
merge
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 9058d3c43578abd2f05d9a5be5510116b8d2a16e.
Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit 4776a6d9afde07f9582d33ba9574f1a204f1eb72.
merge
merge