Merge branch 'master' of https://github.com/MikaelStenstrand/joarc

Conflicts:
css/joomla.css
conflict fix