Fixed columns bug

Conflicts:

	digipal/static/css/dpannotator.css