Sep Commit
Merge branch 'master' of https://github.com/magnifiedman/CC-Embeddable-Galleries

Conflicts:
	lib/config.inc.php