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
Reviewed modified changes
upload jaggery file to the entitlement.js file and place a xacml policy template to the dive
Adding fixes for APPM-236
Merge pull request #68 from ruwany/master

Adding fixes for APPM-236
Merge pull request #58 from jenananthan/master

Issues related to webapp edit fixed - from Jenna
Merge pull request #60 from tgtshanika/master

Fix for duplicate context by ThiliniS
Adding empty check when displaying resources in the overview page
Merge pull request #69 from ruwany/master

Adding empty check when displaying resources in the overview page
Fixed UI issue with web app listing
Fixed policy UI issue
Fixed policy UI issue
Merge pull request #70 from chaturadilan/master

UI Fixes
Merge pull request #71 from jenananthan/master

Stats Related Fixes - by Jenna
XACML policy template
Merge pull request #66 from binalip/master

Add xacml policy template when loading the policy editor
APPM-248 : Fix link not displaying issue
APPM-239 : Added UI collapse tabs for add assert of web app