Merge remote-tracking branch 'upstream/master'

Conflicts:
	themes/effervescence_plus/indexpage.php
Merge branch 'master' of https://github.com/sbillard/ZenPhoto20-Dev into sbillard-master
Merge branch 'sbillard-master'
fix bad package
Merge pull request #11 from sbillard/master

alert tabs
Merge pull request #12 from sbillard/master

slider custom option
Merge pull request #13 from sbillard/master

Theme fixes
Merge pull request #15 from sbillard/master

fix watermark selector
Merge pull request #16 from sbillard/master

add theme, add back missing tinymce compatibility plugin