Skillclassdev

merging skillclassdev with master