Merge branch 'master' of https://github.com/erkkiperkele/Flubber_Ci

Conflicts:
	assets/js/custom.js
Merge branch 'master' of https://github.com/erkkiperkele/Flubber_Ci

Conflicts:
	assets/js/custom.js