no message
Merge branch 'master' into cole
ending efforts to fix the character encoding for now
Fixing the additional maker info for the applications
Merge branch 'cole'