url corrected
conflicts resolved in master branch
conflicts resolved and form modified
url problem fixed
pictures moved to lib folder
pictures moved to lib folder
pictures removed from lib folder
code cleanup
Merge git.shellycloud.com:wantatrip

Fetch from Shelly
code cleanup
gallery show
replaced hardcoded strings with locale strings