Merge branch 'Jiri-dev'

Conflicts:
css/app.css
index.html