merged code and content app versions. minor bug fixed