Rename "Select" to "Combo box"
[!] Bug: Wrong POS/LPOS ordering for categories lists.
Merge branch '1.1.x' into master-dev
Merge branch '1.1.x' into master-dev
[+] Theme tweaker
Merge branch 'master-dev' into s-theme-tweaker
[*] Theme tweaker
[*] ThemeTweaker icon
[*] Theme tweaker
Merge branch '1.1.x' into s-theme-tweaker
[*] Removing fatal error at custom images page
[*] Removing double slashes
Merge branch 's-theme-tweaker' of github.com:litecommerce/core into s-theme-tweaker
[*] Theme tweaker (small changes)
Merge branch 's-theme-tweaker' of github.com:litecommerce/core into s-theme-tweaker
Merge branch '1.1.x' into s-theme-tweaker
Merge branch '1.1.x' into s-theme-tweaker

Conflicts:
	src/classes/XLite/Model/Attribute.php