working
Merge branch 'master' of github.com:IPPETAD/agrilytics

Conflicts:
	farm/templates/marketplace_user.html
Removing 'reset' buttons
They're stooopid anyways