To solve the #161 issue
Merge pull request #164 from sexnothing/master

To solve the #161 issue
Fixes issue #148 for ckfinder path
Merge branch 'develop' into user