Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS into django-rest-framework
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS into django-rest-framework
Merge branch 'django-rest-framework' of https://github.com/caseymacphee/RPi-HAUS into django-rest-framework
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS into django-rest-framework
Merge pull request #27 from markableidinger/master

adds css to registration templates and activation email
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS
Added support for DevicePermissions to three API views
403.html
Merge pull request #28 from caseymacphee/decor

403.html
Push for adding 403s
Merge pull request #29 from caseymacphee/device-permissions

Device permissions
Merge pull request #30 from markableidinger/master

adds top nav bar items
Added a test for API device permission checking
Merge branch 'master' of https://github.com/caseymacphee/RPi-HAUS into device-permissions
Merge pull request #31 from markableidinger/master

adds custom template to logout page, fixes login functionality
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS into control-buttons
Merge pull request #32 from markableidinger/master

templates in active user's name to dataview
Merge branch 'master' of github.com:caseymacphee/RPi-HAUS into control-buttons
Added tests, fixed permissions check on device setup
Added superuser check to device atom posting