add peer view
fix merging bugs
fix for missing model
add scroll to peer view
fix for scrolling reset
Merge branch 'master' into wip/peerview

Conflicts:
	src/CMakeLists.txt
	src/gtk/GtkTorrentInfoBar.cpp
	src/gtk/GtkTorrentInfoBar.hpp
Update submodule
Merge branch 'wip/peerview' of https://github.com/gtorrent/gtorrent-gtk into wip/peerview
fix for peers from other torrents showing up in the list
Merge branch 'wip/peerview' of github.com:gtorrent/gtorrent-gtk into wip/peerview
core branch was merged
Merge branch 'master' into wip/peerview
Merge pull request #94 from gtorrent/wip/peerview

Peer View
Recycle old README; Update to be less confusing
Fix dodgy README
Fix language
Update README.md
Merge branch 'master' into wip/sort