Fixed creative engine desync
Merge remote-tracking branch 'bc/NextGen' into engine

Conflicts:
	common/buildcraft/energy/TileEngineCreative.java
Added missing header
Merge pull request #1609 from dmillerw/engine

Fixed creative engine desync