last changes to rc1
Merge branch 'rc1' of github.com:guardianproject/InformaCam into rc1