removed files committed by mistake, thanks Niphlod
Merge remote-tracking branch 'upstream/master'