extra package for ubuntu 14.04
changed repo location
modified CSP header
Merge branch 'master' into develop
added back in ubuntu 12.04 support