Changed file names
Merge branch 'develop' of github.com:FOSSRIT/Sash into develop