500 page wording as per #875
annotations services improvements, refs #580

better error handling + messages in HTML
use 'overwrite' mode for bulk upload
handle cp1252 encoding for CSV exported from excel
Merge branch 'master' into integration