Issue #31 : change to bring in line with 2014 EFF report
Issue #32 : change to bring in line with 2014 EFF report
Issue #33 : change to bring in line with 2014 EFF report
Issue #34 : change to bring in line with 2014 EFF report
Issue #35 : change to bring in line with 2014 EFF report
Merge branch 'editor' of github.com:citizenme/Content into editor