Added mutalbe copy methods
Fixed a conflict
Added mutable copy method
iOS 7 deprecation related fixes
merging upstream/master from 1cbd1e4 to c289598