Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Added base styles for printing but still page breka stuff missing