Nadin je kralj
Merge branch 'master' of https://github.com/ib2013/chat2push
Popravljeni bugovi sa kanalima
Konflikti
Merge branch 'master' of https://github.com/ib2013/chat2push