Remove merge conflicts
slider1
Slide1
Test3
bugfix
merge
Merge branch 'master' of ssh://github.com/webany/webany