Merge branch 'master' of http://github.com/hacklschorsch/shell-fm into hacklschorsch...