Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/Resource.php
Updated Boxfile with correct shared dirs