another office
new box
new office and box
fixed update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/resources/edit.blade.php