Merge branch 'master' of https://github.com/tinkajts/nobil.no_joomla

Conflicts:
	templates/ladeny_01/css/custom.css