Updates to include .project file.
Merging conflicts for ETPhoneHomeJavaCLI.