fixed issue #25
Merge branch 'master' of github.com:romansosnovsky/mechassembler

Conflicts:
	src/main/java/model/builder/DefaultBodyBuilder.java
	src/main/java/util/ResourceLoader.java