Revert "[merge] SWGEmu unstable branch 19AUG14"

This reverts commit f447996017337e8d8b4e0c0a6e6b6ed151d14cfe.
Revert "[merge] SWGEmu unstable branch 18AUG14"

This reverts commit b93684979bb5fabc1582a7235cd1953e756fa073.

Conflicts:
	scripts/managers/crafting/schematics.lua
[fixed] merge conflict