Added by Kostas Papadimitriou about 12 years ago
Merge branch 'astakos-integration' into ui-astakos-integration