add group by user uid and field permission
Merge branch 'develop' of ssh://github.com/parliamentwatch/parliamentwatch into develop