Accepting timestamp as date when mapping objects
Merge pull request #14 from lafosca/timestamp-mapping

Accepting timestamp as date when mapping objects
Merge branch 'develop' into travis-fail

Conflicts:
	Test/Tests/MappingTests.m