merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.
