harvester rewrite
harvester
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Http/routes.php