Matche astyle to gtorrent-gtk (newer)
Whitespace changle only
Merge branch 'master' into wip/savestate

Conflicts:
	src/Core.cpp
	src/Torrent.cpp