Added light application option (--type=light)
Added basic tcp client/server framework
Resolved merge conflict