Merge remote-tracking branch 'remotes/origin/feature/touch-click-animation' into bugfix/colour-adjustment

Previous merge was messed up, this should fix it

Conflicts:
	src/less/lcars-variables.less

Signed-off-by: Martin Evans <martindevans@gmail.com>
Merge branch 'bugfix/colour-adjustment'
Ok so that attempt to fix it was a clusterfuck, grabbed the correct version from history by hand :P

Signed-off-by: Martin Evans <martindevans@gmail.com>