simplified wording
restructured templates for less redundancy
added a notice on data usage
merged branch 2.1.x into 3.0.x