Laki update
Merge branch 'development' of github.com:art0fdesign/pcn_live into development