custom_list WIP
Merge branch 'master' into verycustomlist
Bugfix on custom template
Changes updated