sadfsddsfgsdr
Merge branch 'master' of http://github.com/ATLASsoft/SoPra.git

Conflicts:
	NodeAnimator/bin/.gitignore