Add missing __init__.py
Merge branch 'feature-combine-fields'
Fix API based authentication
Fix middleware ordering
Merge branch 'master' into jmu-production