Added first parts for Mac application.
Resolved conflicts.