*
Merge branch 'master' of https://github.com/ratkaisutiimi/pajav2.git

Conflicts:
	.gitignore
	sites/default/themes/burarum/css/global.css
*