update bibliography and citations.
Merge remote-tracking branch 'drart/master'

* drart/master:
  update bibliography and citations.

Conflicts:
	icmc-2014/flockingicmc2014.tex