This fixes the content blocks issue
Merge remote-tracking branch 'upstream/master'
add partial export support
Make the Locale-filter more flexible
save the current filter
spaces => tabs, and remove a console.log
Make CommonCookie work with not standard ports.

As stated in http://php.net/manual/en/function.setcookie.php#36202, the
different port shouldn't be added in the domain parameter.
Merge remote-tracking branch 'upstream/master'
Check if template file exists

To prevent errors on frontend when a non-existing template file is used, I've added a check during template editing to check if file exists after update/save.
Merge remote-tracking branch 'upstream/master'
Add setTwitterCard method to Header
"Add summary card to blogdetail"
psr stuff pt1
Add spacing
Coding Standards
add comma
undo this earlier change
Feature/Bug: JS files loading order #893
Same template file check as EditThemeTemplate.php
refactor feedback