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
Make the reindex process put the consolidated changes though resque

This means any error will not kill the whole job and we can have
more than one cpu running on the problem
Merge branch 'master' into issue_3535
3535 Shorter is better
3535 Oops exclamation point
Merge pull request #1752 from zz9pzza/issue_4041

Make the reindex process put the consolidated changes though resque, it is what we are runing
Issue 4015 Don't use phraseapp on the barebones which is used to generate mobi and epub
Merge pull request #1756 from zz9pzza/issue_3795_2

HOTFIX : Issue 4015 Don't use phraseapp on the barebones