merge commits
Merge remote-tracking branch 'origin/master'
Added SSL & <security-constraint> (uncomment before deploy)