Fixed id conflict
Added missing tooltips in navbar
Fixed avatar image tag classes
Epic fancy hyper hyper comment counter
Fancy glow for unread notifications
Corrected headlines
Merge pull request #32 from YaanaLabs/headlines

Corrected headlines
Merge pull request #31 from YaanaLabs/unread-glow

Fancy glow for unread notifications
Merge pull request #30 from YaanaLabs/comment-counter-icon

Comment counter
Merge pull request #27 from YaanaLabs/avatar-fix

Fixed avatar image tag classes
Merge pull request #21 from YaanaLabs/wysiwyg-fix-i21

No WYSIWYG Editor in message form
Merge pull request #22 from YaanaLabs/tooltips-i22

Missing tooltips in toolbar
Merge branch 'master' into layouting

* master:
  Corrected headlines
  Fancy glow for unread notifications
  Epic fancy hyper hyper comment counter
  Fixed avatar image tag classes
  Added missing tooltips in navbar
  Fixed id conflict

Conflicts:
	app/views/channels/relationships/index.haml
	app/views/users/index.haml