Added SPAMR
Merge branch 'rocket'
Merge with upstream
Merge branch 'master' of https://github.com/powercrystals/MineFactoryReloaded

Conflicts:
	src/powercrystals/minefactoryreloaded/lang/en_US.lang