Merge pull request #1 from apache/master

merge latest code

.github/CONTRIBUTING.md

@@ -6,6 +6,6 @@ To make the process smooth for the project *committers* (those who review and ac
 
 ## Contribution Guidelines
 
-Please check out the [How to Contribute guide](http://flink.apache.org/how-to-contribute.html) to understand how contributions are made. 
-A detailed explanation can be found in our [Contribute Code Guide](http://flink.apache.org/contribute-code.html) which also contains a list of coding guidelines that you should follow.
+Please check out the [How to Contribute guide](https://flink.apache.org/contributing/how-to-contribute.html) to understand how contributions are made.
+A detailed explanation can be found in our [Contribute Code Guide](https://flink.apache.org/contributing/contribute-code.html) which also contains a list of coding guidelines that you should follow.
 For pull requests, there is a [check list](PULL_REQUEST_TEMPLATE.md) with criteria taken from the How to Contribute Guide and the Coding Guidelines.

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,7 +12,7 @@
 
   - Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review.
   
-  - Make sure that the change passes the automated tests, i.e., `mvn clean verify` passes. You can set up Travis CI to do that following [this guide](http://flink.apache.org/contribute-code.html#best-practices).
+  - Make sure that the change passes the automated tests, i.e., `mvn clean verify` passes. You can set up Travis CI to do that following [this guide](https://flink.apache.org/contributing/contribute-code.html#open-a-pull-request).
 
   - Each pull request should address only one issue, not mix up code from multiple issues.
   

.gitignore

@@ -14,14 +14,28 @@ tmp
 *.iml
 *.swp
 *.jar
+*.zip
 *.log
+*.pyc
 .DS_Store
 build-target
 flink-end-to-end-tests/flink-datastream-allround-test/src/main/java/org/apache/flink/streaming/tests/avro/
 flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/generated/
-flink-runtime-web/web-dashboard/assets/fonts/
+flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/generated/
+flink-runtime-web/web-dashboard/node/
 flink-runtime-web/web-dashboard/node_modules/
-flink-runtime-web/web-dashboard/bower_components/
+flink-runtime-web/web-dashboard/web/
+flink-python/dist/
+flink-python/build/
+flink-python/pyflink.egg-info/
+flink-python/apache_flink.egg-info/
+flink-python/docs/_build
+flink-python/.tox/
+flink-python/dev/download
+flink-python/dev/.conda/
+flink-python/dev/log/
+flink-python/dev/.stage.txt
+flink-python/.eggs/
 atlassian-ide-plugin.xml
 out/
 /docs/api
@@ -36,3 +50,4 @@ out/
 tools/flink
 tools/flink-*
 tools/releasing/release
+tools/japicmp-output