At the suggestion of Andrey I changed all the http:// to // across the entire New Custodian template so that it doesn't care whether SSL is applied to the site or not when deployed.
Merge pull request #1 from Flowdeeps/security-agnostic

At the suggestion of Andrey I changed all the http:// to // across the e...
add first version of picturefill
Merge pull request #2 from justmarkup/master

Add first version of picturefill
Merge pull request #3 from aleksandarjelicic/master

Styles for editor-inserted images
Merge pull request #4 from aleksandarjelicic/article_rating_may

Article rating may
Merge pull request #5 from ljubar/master

Merger
Merge pull request #6 from ljubar/master

Some late-May changes
Merge pull request #7 from ljubar/master

Remove article comments and rating from static articles
Update layout.tpl
Revert "At the suggestion of Andrey I changed all the http:// to // across the entire New Custodian template so that it doesn't care whether SSL is applied to the site or not when deployed."

This reverts commit f75a46cb109c8683329616d305dc1611fd0b13e8.

Conflicts:
	layout.tpl