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
support to share the entitilement partial
change the table column name in edit-assert.hbs
Merge pull request #61 from jenananthan/master

Support to share entitlement policy
fixing UI consistency issues
fixing consistency issues - textboxes and dropdowns
Edt page UI consistency fixes
Merge branch 'hiranthadhanuka-master'
Merging conflicts
Test commit and push
Merge pull request #1 from wso2/master

Merging master repo with local repo
bs2 to bs3 migration started
Merge pull request #63 from hiranthadhanuka/master

BS2 to BS3 migration started
Bug fixes for APPM-227
Merge pull request #64 from ruwany/master

Bug fixes for APPM-227
Temp fix to avoid break up
fix for statistics relateates issues
upload jaggery file to the entitlement.js file and place a xacml policy template to the dive