lokalne promjene
Merge branch 'master' of https://github.com/ib2013/chat2push
Komitovanje promjena na DefaultCHannelModelu
Conflict dealing
Merge branch 'master' of https://github.com/ib2013/chat2push