templates
first correction of templates
added media, modified settings & about
change requirements, and settings
resolved conflict in merging