Added active class to navbar
Yay XML->JSON! Even used recursion! ;)
manage.py command "import_xml"
Added utility function for xml_importer for use in views
Fixed a small inconsistency between dictionary detail and survey detail
Formatting
Optimization
Converted to use xmltodic
Added xmltodict to requirements
Added language model. Added some sample data
Changed pos to part_of_speech because pos=piece_of_****
w00T!!! XMLImporter is working! Needs testing, @jsouthwo!

I believe that it will only work if there is only one variety currently.
Will need to test further.
Fixes #1
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
Cleanup. Docs
Merge branch 'xml-importer' into dev

Conflicts:
	requirements.txt
Fixed indentation errors in views