Added composer file
COMPAT 3.1 private static changes
Merged in content type changes with update to 3.1