Control

commit before merge
Control Project

Cleaned and fix project files and dependencies