Card #48 fix for link on group add. Aligned DAO method names.
Merge remote-tracking branch 'origin/develop' into develop