changed location of class list
Merge branch 'master' into angular
minor changes