Merge pull request #1185 from sdnetwork/master

Add SECURITY_SUBJECT parameter to FrameworkConfig
Fixes #1186
Merge branch 'master' of git://github.com/Atmosphere/atmosphere