List fix
Merge branch 'master' of https://github.com/lemtzas/Rollem

Conflicts:
	config_junk/join_list.yml
merge
Merge branch 'master' of https://github.com/lemtzas/Rollem
Merge branch 'master' of https://github.com/lemtzas/Rollem
Merge branch 'master' of https://github.com/lemtzas/Rollem
Merge branch 'master' of https://github.com/lemtzas/Rollem
Merge branch 'master' of https://github.com/lemtzas/Rollem
Merge branch 'master' of https://github.com/lemtzas/Rollem
Merge branch 'master' of https://github.com/lemtzas/Rollem
join list fix