Big refactor, logic moved to ProxyConnection
Merge branch 'master' of https://github.com/lukkm/TPE_PROTOS_2013