Correct URL for a ModLS image
Demo specific
Merge branch 'master' of /home/dtrudg/cpfp
Fix division by zero /undef errors in fragment matching
Export ModLS localization probabilities into Excel sheet (VG request)
Relax PepXML import sanity check for now, so that skipped peptides due to unrecognized modification do not lead to a fatal error.
Revert "Demo specific"

This reverts commit 66a3fcb6f867fc52e3a51eb644a62a53a9e8f5f3.
Merge branch 'utsw' of /srv/git/cpfp into utsw
Relax PepXML import sanity check for now, so that skipped peptides due to unrecognized modification do not lead to a fatal error.
Export ModLS localization probabilities into Excel sheet (VG request)
Fix division by zero /undef errors in fragment matching
Fix version number in update script comment
submission.get_path() should not assume data directory specified in config has a trailing slash
Tweak submission view to ensure the 'Actions' section will always show either a button or an error message
Cleaned up the searches form to move the MASCOT_DEFAULT_SEARCH toggle to serverside FormFu from clientside javascript
Proper fix in config parser for no-trailing-slash on data dir
Application of previous commit to ConfigExporter - functionality seems to be duplicated between Role/Config and ConfigExporter
Clean up protein results template file to remove unpaired template escapes
Improve UI display of Search Engine availability. (Ticket [#1])
Bringin in Phil Charles' fixes

Merge branch 'oxford' of ssh://git.code.sf.net/p/cpfp/code into utsw