Filtering for assets table
SOL-20 adding type filter with some deafult values
SOL-20 basic testing
cleanup of asset urls on studio assets page

Conflicts:
	cms/templates/js/asset.underscore
SOL-20 add content type filters instead of extension, fix css issues, add filter text to pagination header
SOL-20 Fixing tests to include filter column
SOL-20 PEP8 fixes
Merge pull request #338 from edx-solutions/dcikatic/SOL-20-filter-changes

Dcikatic/sol 20 filter changes - merging to get eyes on - still need to confirm correct test coverage
SOL-20 Cleaning up code
Merge pull request #339 from edx-solutions/dcikatic/SOL-20-filter-changes

Dcikatic/sol 20 filter changes
SOL-87 add asset type filter unit test
Merge pull request #340 from edx-solutions/dcikatic/SOL-87-unit-tests

Dcikatic/sol 87 unit tests
SOL-20 Bug fix - current_page
SOL-20 stringify contentType before case change, to ensure it is string value
SOL-129 Remove Text category filter and add MS contentTypes
Merge pull request #341 from edx-solutions/dcikatic/SOL-129

SOL-129 Remove Text category filter and add MS contentTypes
SOL-128 move and rename reset filter
SOL-127 Change Type filter title behaviour
Merge pull request #342 from edx-solutions/dcikatic/SOL-127-128

Dcikatic/sol 127 128