fix width and height
Merge branch 'master' of github.com:octoblu/gateblu-ui

Conflicts:
	package.json