Merge branch 'develop' of JF/PineTime into master
Merge branch 'develop' # Conflicts: # doc/buildAndProgram.md
Fix formatting issue on the lap counter in Stopwatch (display lap cou… …nter on 2 characters).