Added by Kostas Papadimitriou over 11 years ago
Merge branch 'current_changes'
Conflicts: snf-astakos-app/Changelog