Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Updated publizon client to newest version
Merge remote-tracking branch 'aakb/master'
Merge branch 'master' into development