some texture stuff that doesn’t work yet
Merge branch 'wolfgang_20140429' into wolfgang_20140425