Began working on iter 3 revisions to functional tests and views
Merge branch 'master' of https://github.com/brndnthai/plantivity
Need to commit before pulling. Have not done much
Merge branch 'master' of https://github.com/brndnthai/plantivity
Fixed key value error when calling json_to_plan() in overwrite_plan()
Managed merge conflict
Merge branch 'master' of https://github.com/brndnthai/plantivity

Conflicts:
	plantivity/settings.py