Added in ores
Merge branch 'master' of https://github.com/Electrodynamics/EDX

# By Rob Latcham
# Via Rob Latcham
* 'master' of https://github.com/Electrodynamics/EDX:
  Created ID Helper.
  Simplified the model loader
  Added stack helper, fixed creative tab and relocated prefabricated blocks

Conflicts:
	src/main/java/com/edxmod/electrodynamics/Electrodynamics.java