Remove print
Refactor to fix abstract inheritence
minor editing
Edit inline with Pagination Fixed
Merge branch 'pagination_fixed' into develop
Merge branch 'develop' of github.com:ff0000/scarlet into develop
disable OnExit safety valve
Merge branch 'develop' of github.com:ff0000/scarlet into develop
Solves bug with r.js builder when passing in an empty array.
Merge pull request #2 from ff0000/feature/minified-javascript-fix

Solves bug with r.js builder when passing in an empty array.
Patch the vary headers for cacheviews
Use cache middleware prefix if available
Add readonly fields
fixed grammar in docs
Test for empty values the django way
Truncate log messages
Unregister primary bundles automatically
Avoid context conflict in accounts
Fix version id based preview
Merge branch 'develop' into feature/tags_update

Conflicts:
	scarlet/cms/views.py