Fixed a small inconsistency between dictionary detail and survey detail
Added some ignore files; created mail mapping file to improve Git reporting
Glosses are adding, just need to clean up js still
glosses are added but still need to work on js
fix merge fail
glosses works for adding, I just need to do pretty js stuff to make everything good
Merge branch 'dev' of github.com:tu-software-studio/websurv into dev
updated requirements.txt
Merge branch 'xml-importer' into dev

Conflicts:
	requirements.txt
Fixed indentation errors in views
Moar indentsss
And indentation on add functions
Fixed project_add template to show form
Removed obsolete xml file
Update .gitignore
Merge branch 'master' into dev
Update .gitignore
Merge branch 'dev' of github.com:tu-software-studio/websurv into dev

Conflicts:
	.gitignore
Added extra metadata to variety