Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 fb41e2139d572d66b9ee2578d23fe0724534da6b

 CONTRIBUTING.md

File was renamed from CODING_NOTES.php.txt
@@ -1,4 +1,4 @@
Some guidelines for web development with PHP.
# Some guidelines for web development with php.
-----------------------------------------------------
* Unix Line Breaks Only, NO windows breaks please.
* Tabs to indent lines, NO spaces