update changes 18.03.2013
Merge branch 'master' of https://github.com/jdockeray/furry-octo-dangerzone