Merge branch 'develop' into downloader-proto

Godeps/Godeps.json

Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go

miner/worker.go

p2p/server.go

rpc/api.go

rpc/args.go

ui/qt/qwhisper/whisper.go

whisper/envelope.go

whisper/filter.go

whisper/main.go

whisper/message.go

whisper/message_test.go

whisper/peer.go

whisper/peer_test.go

whisper/sort.go

whisper/sort_test.go

whisper/topic.go

whisper/topic_test.go

whisper/util.go

whisper/whisper.go