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
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
Merge pull request #64 from ruwany/master

Bug fixes for APPM-227
Temp fix to avoid break up
fix for statistics relateates issues
Merge pull request #67 from ruwany/master

Adding fix for APPM-237
Merge remote-tracking branch 'upstream/master'
fix for tracking code
fix for toggle css classes
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
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