adding classes with id now
Merge branch 'devjg'

merge with devjg