Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/snakeremake/views/BaseLevelView.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/snakeremake/views/BaseLevelView.java
Clock