Merge branch 'master' into dev

Conflicts:
erogenousbeef/bigreactors/common/BRConfig.java
Fixing new grab/drop GUI controls