test commit
Merge branch 'ss1-1' into develop
just a test
Merge branch 'develop' of git://github.com/dvanactka/slideshows into develop
test pull