Merge branch 'master' into t5_home_edit
[ticket:5] Update test.
[ticket:5] Move contacts code from view to form.
Merge branch 't5_home_edit'