Adding changes to subscriptions_controller and subscriptions index.html.erb
3535 Merge conflicts
3535 Enigel's changes
3535 Spacing and class name tidying
3535 Remove extra spacing on subscription listboxes
3535 Series and work titles are html_safe
3535 Paginate subscriptions and view diferent types on different pages
3535 html_safe
3535 Test separating subscriptions
3535 Alphabetize subscriptions like Lal had it
3535 Proper current state even when paginated
3535 Convert subscriptions to array for sorting mixed subscriptions
3535 Take out the CSS change I added
Merge branch 'master' into issue_3535
3535 Shorter is better
3535 Oops exclamation point
Merge pull request #1741 from sarken/issue_3535

3535 Separate subscriptions by type