Squashed commit of the following:

commit 73c41ab5e4792caaf3ef359dca945dfb9524989b
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Thu Oct 2 18:39:18 2014 -0700

    Added numbers for benchmark tests

commit ba5a1cac435c502736701b404084a33c9a594d75
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Thu Oct 2 16:28:40 2014 -0700

    Few errors corrected

commit 6fa8b2ba5b277088b472643fe8c53cebc6198cb3
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Thu Oct 2 15:58:11 2014 -0700

    commit for adding comments and copywrite messages

commit 72e2752ed8cf647eb6e09dfccdbca5c9429113d4
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Thu Oct 2 11:09:20 2014 -0700

    Changed to testbench app

commit a400781d7ffc22cc61d18e07c272084d05d9342f
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Thu Oct 2 10:30:51 2014 -0700

    benchmark apps improved to take default values

commit b08837ceb1939aba20a64bbe89d263a5941132a3
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Wed Oct 1 22:29:33 2014 -0700

    changes added for benchmark tests

commit 8185bd51976c9bb1cf6464e2471e0753f12b314d
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Wed Oct 1 11:59:38 2014 -0700

    commit for benchmark test folders

commit b04e897cc27438b0b49c99ce3bf0474b6a3101c5
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Wed Oct 1 10:28:47 2014 -0700

    added some input values in benchmark apps

commit f14b7bd0929ed06be2dd57627f3da46419247078
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Tue Sep 30 15:43:52 2014 -0700

    commit for benchmark tests

commit 98f35105e0a3922d2d11df648934ce705ec2a41d
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Sun Sep 28 16:50:27 2014 -0700

    code for benchmarking apps

commit 424373b2e8f0ece4058a5f970bfc4c8976401096
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Fri Sep 26 15:21:55 2014 -0700

    Commit seedeventgenerator benchmark

commit e3cf0a971418154f0112a4f1e28bf91549776691
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Fri Sep 26 15:13:27 2014 -0700

    created categories inside benchmark

commit e8adbecba8d6acb04019d5bece666008b41497d3
Author: Prerna Manaktala <prerna@datatorrent.com>
Date:   Fri Sep 26 11:26:51 2014 -0700

    commit for DevNullCounterBenchmark
MLHR-1347: Block reader
test data for block reader
removing conflicts for merge
Merge branch 'dt-dev' of github.com:DataTorrent/Malhar into mlhr-SPOI-3240

Conflicts:
	benchmark/src/main/java/com/datatorrent/benchmark/HDFS/HDFSBothInputOutputOperatorsBenchmark.java
	benchmark/src/main/java/com/datatorrent/benchmark/HDFS/HDFSByteOutputOperator.java
	benchmark/src/main/java/com/datatorrent/benchmark/HDFS/HDFSOutputOperatorBenchmark.java
commit after putting hdfs benchmark operators in fs directory
renamed folders to lower case
Merge branch 'MLHR-1347' of github.com:chandnisingh/Malhar into chandnisingh-MLHR-1347
 added the properties for throughput in properties file
minor correction
Parameterize WebSocketInputOperator
Parameterize PubSubWebSocketInputOperator
Merge pull request #1143 from tweise/wsinput

Parameterize WebSocketInputOperator
WebSocket option for AdsDimensionDemoWithHDS.
Renaming and modifying DimensionComputationPerformanceTest to be a unit test
Merge pull request #1145 from sashadt/dt-dev

Renaming and modifying DimensionComputationPerformanceTest to be a unit ...
Merge pull request #1144 from tweise/dt-dev

WebSocket option for AdsDimensionDemoWithHDS.
moved kafka json encoder from demos to contrib
Merge pull request #1146 from ashwinchandrap/kafkaencoder

moved kafka json encoder from demos to contrib
Workaround for property override bug.
Make PubSubWebSocketInputOperator topic configurable.