Finish polling
updated test config, again
new test user for dev / new count-lines task in gruntfile
uncomment cmlogger
uncommend cmLogger.debug in event / fixxed friendrequest counter drtv /
changed icon to write a new talk
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/comps/contacts/srvc-contacts-adapter.js
	app/comps/contacts/srvc-contacts-model.js
	app/comps/core/srvc-object.js
fixxed answer buttons and emojilist
Merge remote-tracking branch 'origin/dev' into dev
add identity:update event
fix?!
fix
uncomment notifies
Update fixes
update icon font-size
update test
add unbell event
now emojis with em scaling
emoji map / try to fixxed user model
add cmUserModel Event Trigger updated:finished to cmConversationModel
on event conversation try to decrypt