Merge branch 'hotfix/1.5.4'
Bump version properly..
Merge branch 'hotfix/1.5.5' into develop

Conflicts:
	pi.surgeree.php