Fix in addition to commit 32da629f1ea54e8480b642d39685327e8dda7ebd : installation will fail when version of php-db installed in server is different from included there
missing include from send_sms page after commit 8fbf5be69ba99c5a4b8a0aa9d745385b8f7b9d00
Prevois commit brakes calendar, so revert
Merge remote-tracking branch 'upstream/master'
re-add forcing email charset to UTF-8
Fix localisation for page_register and page_forgot
Fix localisation of strings Home,Logout,User configuration,Preferences and anything added in menu or footer by themes module on plugin pages.
Merge remote-tracking branch 'upstream/master'
Better representation of contact list,grouping "Group codes" by contact , avoid duplication contacts which belongs to multiple groups
Revert "Better representation of contact list,grouping "Group codes" by contact , avoid duplication contacts which belongs to multiple groups"

This reverts commit 51eb95db9db5ea96643193455a08b5fc0e8c6063.
Merge remote branch 'upstream/master'
Better representation of contact list try 2, sql is universal for all rdbms, links to edit group
typo fix
fix displaying groups in search view after dfc9b57c81d9da02fa0cfb39498503b8f3b33fad
Revert "fix displaying groups in search view after dfc9b57c81d9da02fa0cfb39498503b8f3b33fad"
Implemented in 0012f926aefbd6b5e76bd780e8e19220c6a28f1c

This reverts commit a4fd73e878948b253ab99678ebfabfc21947bc7e.