pulled from master
fdf
fixed merge
fixed
sdfsf
Merge branch 'master' into working
la til noe greier...
sdfsd
Merge branch 'working'