merge 1.5.1
merge
Bugfixes: use ActionSherlock.theme on 2.3.3, handle is listFiles returns with null
bumping versions
Merge branch 'hotfix/1.5.3' into develop