Make content modal small
Make gitignore ignore Solr stuff.
Separate timeout modal from content modal
Add a safe framework for the content modal
Change development timeout back to 2 billion!
Merge branch 'develop-nigel' into develop
Fix typo
Fix issue in job#sort_line_items test
Merge remote-tracking branch 'origin/develop' into develop