Changes for build to work
Merge branch 'master' into gplus_fix
Merge branch 'STREAMS-216' into gplus_fix
Merge branch 'STREAMS-223' into gplus_fix
no message
Merge branch 'gplus_fix' into w2o-master

Conflicts:
	streams-contrib/streams-processor-urls/src/main/jsonschema/org/apache/streams/urls/LinkDetails.json
Merge branch 'master' of https://github.com/w2ogroup/incubator-streams into w2o-master

Conflicts:
	streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/provider/GPlusUserActivityProvider.java
Merge branch 'master' of https://github.com/w2ogroup/incubator-streams into w2o-master

Conflicts:
	streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GPlusEventClassifier.java
	streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/serializer/util/GPlusEventClassifierTest.java
Merge pull request #15 from apache/master

Merge Apache Master 2014/11/24
Merge branch 'w2o-master' into STREAMS-234

Conflicts:
	streams-components/streams-converters/pom.xml
	streams-contrib/streams-provider-datasift/pom.xml
Merge pull request #16 from apache/master

Used revert to rewind 6 merges, pushed to this repo mistakenly.
Merge branch 'master' of https://github.com/w2ogroup/incubator-streams into w2o-master

Conflicts:
	streams-components/streams-converters/pom.xml
	streams-contrib/streams-provider-datasift/pom.xml
Merge branch 'STREAMS-237' into w2o-master
Merge branch 'STREAMS-236' into w2o-master
Merge branch 'master' of https://github.com/w2ogroup/incubator-streams into w2o-master

Conflicts:
	streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java
bumping versions to address verify failure (STREAMS-240)
Merge branch 'master' of https://github.com/w2ogroup/incubator-streams into w2o-master
newer war plugin
Merge branch 'master' of https://github.com/w2ogroup/incubator-streams into w2o-master
Merge branch 'STREAMS-240'