Merge branch '1.6'

* 1.6:
  minified js
  texture label toggle
  JavaScript for email settings forms changes
  Can customize the email message that goes out to the user who filled out the survey. Support for a few basic template replacements.
  admin emails working. house cleaning
  admin emails output the respondents answers to the questions admin email message filterable admin email subject filterable
  closes #14 - javascript errors when not editing questions or answers and no changes have been made.

Conflicts:
	js/admin-script.min.js
Merge branch 'master' of c8tastrophe.com:/var/www/git/awesome-surveys

* 'master' of c8tastrophe.com:/var/www/git/awesome-surveys: