Update Makefile
Merge branch 'develop' into 177-history-on-content-types