Fix travis not failing when tests not passing
Fixed merge code broken
Merge branch 'develop' into travis-fail

Conflicts:
	Test/Tests/MappingTests.m
Merge pull request #17 from lafosca/travis-fail

Fix travis not failing when tests not passing