ROBE-209
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/robe-admin-ui/index.html
ROBE-209 fixed
Merge remote-tracking branch 'origin/master'