fixed img sizes and table content position
Merge remote-tracking branch 'origin/master'

Conflicts:
	root/index.jsp