Show Pop up to edit projects
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/defaults/WebServices.js