Merge branch 'code-cleanup' into develop
For some reason this bullshit is fucked
Merge branch 'develop' into feature-lives
Added timer to ready state

Now game will stay at READY for 2 seconds (or whatever is specified in
ApplicationConstants)
Merge branch 'feature-lives' into develop
Merge branch 'develop' into code-cleanup