ios 6
Merge branch 'master' of https://github.com/github/Mantle

Conflicts:
	Mantle/MTLModel.h
fixed a couple of compile error with iOS 6.