Merge branch 'hotfix/1.0.1' into develop
Git ignore update
API formats, json, xml and update on Ouath2
Conflicts in conf.php resolve