Merge remote-tracking branch 'origin/puteo2' into dev

Conflicts:
	src/somecode.js
Merge remote-tracking branch 'origin/puteo' into dev