schedule changes
Merge branch 'master' of https://github.com/edwardsb/usfarm

Conflicts:
	.idea/workspace.xml
updates to the UI, as well as implementing the content provider