ENYO-3078: Fix the bug by initilizing the attribute "activeKeyId" in "setProjectConfig()".
ENYO-3078: correct a display bug that occure when the Android's signing Key is selected for the first time and cause the keyStore password input to not be displayed.
ENYO-3078: add comments to the functions "setProjectConfig()" & "gentProjectConfig()" for the kind {Phonegap.ProjectProperties.Target}.
ENYO-3078: code formating.
Merge branch 'master' of github.com:enyojs/ares-project into ENYO-3078

Conflicts:
	services/source/phonegap/PhonegapUIRows.js
ENYO-3037: Require non top-level directory for project creation

Enyo-DCO-1.1-Signed-off-by: Jeremy Thomas <jeremy.thomas@lge.com>
Merge branch 'master' of github.com:enyojs/ares-project into ENYO-3078
start working on 0.2.6
Adding serverSelectable property for better selection control
Merge pull request #577 from enyojs/ENYO-3037-jeremythomas

ENYO-3037: Require non top-level directory for project creation
Merge pull request #557 from enyojs/ENYO-3078

ENYO-3078: Signing keys correctly saved in project.json and displayed in the UI.
Merge branch 'master' of github.com:enyojs/ares-project into ENYO-2935

# By adicherafik (4) and others
# Via adicherafik (2) and others
* 'master' of github.com:enyojs/ares-project:
  Adding serverSelectable property for better selection control
  start working on 0.2.6
  ENYO-3037: Require non top-level directory for project creation
  ENYO-3078: code formating.
  ENYO-3078: add comments to the functions "setProjectConfig()" & "gentProjectConfig()" for the kind {Phonegap.ProjectProperties.Target}.
  ENYO-3078: correct a display bug that occure when the Android's signing Key is selected for the first time and cause the keyStore password input to not be displayed.
  ENYO-3078: Fix the bug by initilizing the attribute "activeKeyId" in "setProjectConfig()".

Conflicts:
	npm-shrinkwrap.json