Skillclassdev

merging dev to master