Layouting
Merge branch 'master' into layouting

* master: (977 commits)
  Enable CSS Comments
  Rebased the whole master branch
  ups
  notifications fixes
  avatar className bugfix
  removed shit
  some fixes
  Relationship layoutings
  Colored icons
  Corrected headlines
  Fancy glow for unread notifications
  Epic fancy hyper hyper comment counter
  channels/all page
  Layouting, translations and more
  Fixed avatar image tag classes
  Added missing tooltips in navbar
  Fixed id conflict
  Notifications, feedback and more
  bugfixes
  Readme update
  ...

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/framework/mixins.scss
	app/assets/stylesheets/framework/variables.scss
	app/assets/stylesheets/layout.scss
	app/assets/stylesheets/main.scss
	app/assets/stylesheets/messages.scss
	app/controllers/application_controller.rb
	app/controllers/users/notifications_controller.rb
	app/models/notification.rb
	app/views/channels/all.haml
	app/views/channels/messages/index.haml
	app/views/channels/relationships/index.haml
	app/views/shared/_message.haml
	app/views/users/index.haml
	config/environments/development.rb
	config/locales/de.yml
	config/locales/en.yml
Flat navbar
Removed merge markers
Removed old animation stuff
Fixed position
Merge pull request #37 from YaanaLabs/layouting

Layouting