Getting rid of utf8-bytestring
Refactor FileUpload to use String instead of utf8-bs
Merge branch 'master' into do-we-really-need-utf8-bytestring

Conflicts:
	srv/src/Util.hs
city is bounded
Bump vin-parser
Fix stripWs (#539)
Fix table format (#391)
Use dealer's e-mail (#391)
Add action id to subj (#391)
Use CP1251 as a front-end encoding for partner bulk import handler (#339)
Merge branch 'master' into do-we-really-need-utf8-bytestring

Conflicts:
	srv/src/Snaplet/FileUpload.hs
Merge branch 'master' of github.com:f-me/carma

Conflicts:
	srv/src/ApplicationHandlers.hs
	srv/src/Snaplet/FileUpload.hs
Merge branch 'master' into do-we-really-need-utf8-bytestring
Merge from master