update for local development
update en.yml file
form changes
form and javascript updates
reset database things table
gitignore
Add mailers, change favicon, add link to triangle wiki, embed pdf in terms light box
Merge pull request #1 from XFinger/form_update

Form update
Merge branch 'new'

Conflicts:
	app/assets/stylesheets/screen.css
	app/mailers/thing_mailer.rb
	app/views/things/adopt.html.haml
	config/application.rb
	config/initializers/secret_token.rb