Front end improvements and add dynamic lesson number
fixing a link in the main navigation
fixing conflicts
Update highlight modules
Resolved conficts
Latest styling tweaks merged in
Merge branch 'feature/29' into develop