fix missing template err in warper login hack
Merge branch 'master' into integration
annotations - handle unicode in csv, date parsing
Merge branch 'master' into integration