updated to citadel 3.0
citadel and namelayer dependency
final update
Merge branch 'master' into citadel

Conflicts:
	plugin.yml
	pom.xml
	src/com/github/igotyou/FactoryMod/listeners/FactoryModListener.java
Merge branch 'citadel'