lma special changes
Merge branch 'develop' of github.com:webbtj/jam-sesh into develop