App should now keep screen on while running
Merge branch 'origin/master'