Updating subproject reference
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Buildcraft
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Adding Intellij configurations
Merge remote-tracking branch 'upstream/master'
Added the configuration to build the server
Merge pull request #31 from Maikar/master

Intellij Configurations