This repository has been archived by the owner on Jan 14, 2019. It is now read-only.

merged dev branche, removed conflicts