Changes to MakeHuman original
Moving changes to website
Merge branch 'develop' into origin_update

Conflicts:
	src/phyton/makehuman/core/mhmain.py
Changes to MakeHuman original
Merge branch 'original_code' into origin_update