Merge from Bibs commit '6210240163386b731291a3d8ce7bd4b2b864100b'

Conflicts:
	Bibs/ProgLang.bib
Merge from Bibs commit '7c136ff9b694052ef449175279b6d72af956d464'
Merge from Bibs commit 'd59985392cfc5bbb61d28342985c7937d1c7ef89'
Merge from Bibs commit '46aa2d46efe71d7184e6d0eea8a95a2e47e5d92c'
New bib entry