small upgrade
Merge branch 'poplus'

Conflicts:
	poplus/basic/config.ini