from dev
Merge branch 'master' of https://github.com/EWB/adk-bib
Merge branch 'master' of https://github.com/EWB/adk-bib
Merge branch 'master' of https://github.com/EWB/adk-bib
Merge branch 'master' of https://github.com/EWB/adk-bib
Merge branch 'master' of https://github.com/EWB/adk-bib
various updates