update sync script
add badge name to list of fields displayed
Merge branch 'feature/find_badges' into develop
only display the option sets connected to a type of merch
upgrade to newest MortisCMS with not-found content fixes