First commit in branch dev

Actual project