Merge pull request #1 from kskogen-iseatz/master

Need to check for OSX editor too
test commit

!!!
Merge pull request #2 from treyd3d/master

TEST COMMIT
untracked assembly/library files
Cleanup