Line thingy
Merge branch 'master' of github.com:IPPETAD/agrilytics
Few more UI things
Merge branch 'master' of github.com:IPPETAD/agrilytics

Conflicts:
	farm/templates/field.html