Fix missing close curly in beisel album template
Merge pull request #1252 from caldwell/album-fix

Fix missing close curly in beisel album template
Merge branch 'development'
Merge branch 'development'
Merge branch 'master' of github.com:photo/frontend
Change credential text to use the same identifiers as the commandline tools

This allows a single simple cut/paste into a config file.
Merge pull request #1268 from sneakypete81/credentials_display

Change credential text to use the same identifiers as the commandline tools
Merge branch 'development'
Merge branch 'master' of github.com:photo/frontend
Serve Gravatars via SSL when page is served over SSL.
Removing deprecated group queries. #1247
Making buttons on upload page be consistent with btn-brand class. #638
Moving logo url into variables.less. #638
Adding support for twitter:card="gallery". Closes #1370
Fixing Tutorial plugin (js) and refactoring event handler attachment. Closes #1374
Adding click handler for lightbox .photo div to advance to next photo. Closes #1391
Adding HEAD support in epiphany library. #638
Skip deletion of original if $skipOriginal was passed in. Closes #1394
Merge branch 'serve-gravatars-via-ssl' of https://github.com/agrueneberg/frontend into pr-1363

Conflicts:
	src/libraries/models/User.php