Merge branch 'master' into raysmond
add category selection in building group form
Merge branch 'raysmond'