Using locate_template to take child theme templates into consideration
Merge branch 'dev' of github.com:graphpaperpress/sell-media into dev