Merge branch 'nickholub-master'
Clean input operatoers in lib
fix some minor issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	contrib/src/main/java/com/datatorrent/contrib/siteops/ApacheAccessLogAnalaysis.java
	demos/src/main/java/com/datatorrent/demos/pi/Application.java
	demos/src/main/java/com/datatorrent/demos/rollingtopwords/Application.java
	demos/src/main/java/com/datatorrent/demos/samplestream/Application.java
Removed existing PubSubWebSocket operator tests and helpers #54
Added test that tests PubSubWebSocketInputOperator and PubSubWebSocketOutputOperator fixes #54
Added comments that the web socket message parsing and composing will be available from API and the users should not rely on the code that is doing it currently in the library #54.
#15
Move some classes back to the original package to minimize the impact on
other project
Fixed warnings #54.
#15
Change some comments and add apache license to new created classes
#15 
In the unit test we just need to use HDFS interface to test on local fs
added error message
#15 Fix the unit test
#15

Merge remote-tracking branch 'origin/master'

Conflicts:
	library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketInputOperatorTest.java
	library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperatorTest.java
#15 fix some problem caused by eclipse refactor
#15
#15 Fix test case
Test the branch
#53

Initial commit
#53 sencond commit