Merge remote-tracking branch 'Ariadne-CMS/master'
Merge remote-tracking branch 'Ariadne-CMS/master'
Merge remote-tracking branch 'upstream/master'
added documentation in correct package
Adding editorConfig file
added 'default' value for hash:;get
added poser badges
Merge remote-tracking branch 'origin/master'
ignore composer stuff