Merge branch 'LIB001-454'
LIB001-579 Some initial config for Physics collection
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/physics.php
Merge pull request #52 from robintaylor/master

LIB001-579 Some initial config for Physics collection