rename
Merge branch 'master' of https://github.com/paulfroloff/linux

Conflicts:
	transmission/settings.json