Restored old changes.
fixed some of the problems with mars scene importing
MARS scene importer works except armature placement; correctness needs to be shown with suitable scene
Merge branch 'master' of https://github.com/rock-simulation/phobos

Conflicts:
	importer.py