Merge branch 'master' into fix-apm-editor

# Conflicts:
#	app/aem/core/src/main/java/com/cognifide/apm/core/scripts/LaunchMetadata.java
#	app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java

Author: dprzybyl

app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/reference/reference.html

@@ -88,14 +88,12 @@ <h3><a name="permissions">Permissions</a></h3>
     Wrap them into square brackets like in examples below.
 
     <div class="code-example">
-      <code>
-        FOR-USER "foo" BEGIN
-        ALLOW "/content" ["ALL"]
-        ALLOW "/etc" ["READ"]
-        DENY "/content/bar" ["MODIFY", "DELETE"]
-        ALLOW "/content/bar" ["jcr:nodeTypeManagement"]
-        END
-      </code>
+      <code>FOR-USER 'foo' BEGIN
+	ALLOW '/content' ['ALL']
+	ALLOW '/etc' ['READ']
+	DENY '/content/bar' ['MODIFY', 'DELETE']
+	ALLOW '/content/bar' ['jcr:nodeTypeManagement']
+END</code>
     </div>
 
     The default ACL effects the whole subtree of the target node, you can limit it by adding a
@@ -104,13 +102,11 @@ <h3><a name="permissions">Permissions</a></h3>
     You can use STRICT as a glob pattern to match a target node only. See examples below:
 
     <div class="code-example">
-      <code>
-        FOR-USER "foo" BEGIN
-        ALLOW "/content" glob="bar" ["ALL"]
-        DENY "/content" glob="bar" ["jcr:nodeTypeManagement"]
-        ALLOW "/content/foo" glob="STRICT" ["ALL"]
-        END
-      </code>
+      <code>FOR-USER 'foo' BEGIN
+	ALLOW '/content' glob='bar' ['ALL']
+	DENY '/content' glob='bar' ['jcr:nodeTypeManagement']
+	ALLOW '/content/foo' glob='STRICT' ['ALL']
+END</code>
     </div>
   </section>
   <section>
@@ -133,4 +129,4 @@ <h3><a name="predefined-definitions">Predefined definitions</a></h3>
       </tbody>
     </table>
   </section>
-</div>
+</div>