refactoring and images sorting
Merge branch 'master' of https://github.com/2702/fusionLighter