Build #173 (Dec 12, 2013 5:16:01 AM)

	Changes fix manual merge derps (details / githubweb)
	Started by an SCM change
	Revision: faedd83413c4463271ee6940650a671c00d7f37e Repository: https://github.com/SlimeKnights/TinkersConstruct.git origin/master