Fixed Add/Edit Chat button
Merge pull request #1240 from AdmiralJota/1238_chat_button

Fixed Add/Edit Chat button
Merge pull request #1241 from buttonmen-dev/master

pull changes from master to dev on 2014-08-24