Actionlist templates added
Merge branch 'develop'