Fix javadoc error causing build to fail
Updated implementation to reflect latest API changes.

* Implemented getBlock() and getItem().
* Added MixinItemType and MixinMinecraftServer.
* Moved Server methods out of Game and into MixinMinecraftServer.
* Removed old config methods in PreInit.
Update SpongeAPI.
Fleshing out the "conflicting method" examples
Fixed build issues.
Switch config injections to use API annotations instead of Named

This required an API update because of missing BindingAnnotation marker
Merge branch 'master' of git://github.com/SpongePowered/Sponge into SpongePowered-master

Conflicts:
	src/main/java/org/spongepowered/mixin/impl/MixinEventPreInit.java
	src/main/java/org/spongepowered/mod/SpongeGame.java
	src/main/java/org/spongepowered/wrapper/BlockWrapper.java
	src/main/resources/mixins.sponge.json
Merge branch 'SpongePowered-master'

Conflicts:
	src/main/java/org/spongepowered/mixin/impl/MixinEventPreInit.java
	src/main/java/org/spongepowered/mod/registry/SpongeGameRegistry.java
	src/main/java/org/spongepowered/wrapper/BlockWrapper.java