Merge pull request #4 from willametteuniversity/fhaynes

Fixed a syntax error. Fixed a missing __init__.py.
Merge pull request #5 from willametteuniversity/fhaynes

Fixed a syntax error. Fixed a missing __init__.py.
More fixes to tests. Made fixtures for some classes
Merge pull request #7 from willametteuniversity/hparker

Hparker
made some changes to urls.py and views.py
Added url for category hierarchy
Merge branch 'development' of https://github.com/willametteuniversity/webcirc2 into development
added a Category Hierarchy view that displays a hierarchy of categories in the database
Merge pull request #8 from willametteuniversity/development

Development
Changes to categoryHierarchy in views.py
added Label.json to fixtures in website
Added fixture for ActionType
changes to c category hierarchy code
more changeses to category hierarchy
Removed commented out getHierarchy function.
Merged views.py
Started on autocomplete for some new inventory item form fields. Added in some more fixtures.
Merged in kameron's code