fixed gcc warning
Merge branch 'master' of gitorious.intern.artcom.de:pro/y60vlc
removed DS_Store file added gitignore