** Last slide dirty fidlings for teh PAGE
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git

Conflicts:
	sites/default/themes/burarum/templates/views-view--courses-not--page.tpl.php