Merge branch 'livetest' into development
Fixes for mobile view
Merge branch 'development' into livetest