added new templates, and changed models/serializers
resolved merge conflicts