Merge branch 'background_file_processing' into develop
Merge branch 'background_file_processing' into develop
Update API doc.md
Update API doc.md
develop merge
Merge branch 'develop' into page-proofs
Merge branch 'page-proofs' into develop
Merge branch 'develop' of github.com:7bits/probation-bicycle-ways into develop
Fixed fonts in header and footer
Fixed map control fonts
Customized radio buttons was added.
header
Merge branch 'develop' of https://github.com/7bits/probation-bicycle-ways into page-proofs
Merge branch 'page-proofs' of https://github.com/7bits/probation-bicycle-ways into page-proofs
delete fonts
Changed upload button hover
Merge branch 'page-proofs' of github.com:7bits/probation-bicycle-ways into page-proofs
added upload button hover
 merge
Fixed all merge conflicts