fix size
Merge branch 'origin/master'

Conflicts:
	web/public/scripts/app/main.js