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
Fix stripWs (#539)
Fix table format (#391)
Use dealer's e-mail (#391)
Add action id to subj (#391)
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
Fix broken build
Update users.json format
s/activated_at":null/&,"email":null,"reset_token":null,"reset_requested_at":null/g
Role-based authorization check (#529)
Pass only users with "local" role in 'chkAuth' combinator
Deny requests when the role check fails, not vice versa
Script to add role "local" to all users (#529)
Add role "local" in users.json (#529)
Hush 'invalid utf8' exceptions (#519)
Update Programs.json

добавлена программа Ford+
Update ProgramInfo.json

добавлена программа "fordPlus"