detailed edit
plugins directory renamed
add v1.1.3 features
Merge branch 'master' into dev