Merge pull request #1 from apache/master

update from apache/incubator-storm
Merge pull request #2 from apache/master

update from apache/incubator-storm
Merge pull request #3 from apache/master

update from apache/incubator-storm
Merge pull request #4 from apache/master

update from apache/incubator-storm
STORM-312 add storm monitor command line tools
seperate out argument parsing in Monitor class; remove 'waiting' status in mertics; add argument -s stream to specify stream
make topology-name to be an argument; make component-id optional
rm unused :use class; better handling InterruptedException; change MetricState and Poller better fits for Java
Merge branch 'storm-monitor-cmd' of https://github.com/Gvain/incubator-storm into STORM-312

STORM-312: add storm monitor tools to monitor throughtput interactively
Added STORM-312 to changelog and readme.
Merge branch 'STORM-312'

Conflicts:
	CHANGELOG.md