added location column, image resizing, sorting, datetime fixes
Merge branch 'linda3' into TEST

Conflicts:
	compas/app/views/layouts/application.html.erb