Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php

readme.txt

@@ -65,7 +65,8 @@ No. There is currently no way to have activity propagate up without creating dup
 
 
 = 1.5.2
-* fixed admin view
+* fixed admin view: fix display error in subgroup listing
+* add function: remove from parent group in subgoup listing
 
 = 1.5.1 =
 * german translation changed