fixed issue related to edit webbapp ,jira APPM-215
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/apps/publisher/themes/appm/js/resource-add.js
code fomatted
Merge pull request #58 from jenananthan/master

Issues related to webapp edit fixed - from Jenna