Transalation issue on French
Merge remote-tracking branch 'upstream/master'
Makes all in listing actions look and behave the same.
Removes not used anymore alternate_class helper.

Alternate class job is now  done by calling table-striped CSS class in the <table> tag.
Merge remote-tracking branch 'upstream/master'
Update email_notify.rb

Change email_notification to email to fix password reset etc.
We don't need multiple helpers to do one thing
Fixes the macro display thing.

Apparently, nesting a crapload of content_tag ... do doesn't work as expected, so I'm using a partial instead of a helper here.
Merge pull request #215 from tboeckmann/patch-1

Fix silly error in email_notify.rb
Merge branch 'master' of github.com:fdv/publify
Update search.html.erb

Translate from Precedent & Suivant to... c'est mieux.
:previous_label => 'Previous', :next_label => 'Next'
Clean feedback controller
Makes the visual editor more usable
Adds a per textfilter toolbar (markdown, textile, none).

TODO:

* The markdown and textile links use html ones, too lazy.
* Change the toolbar when you change the filter (JS sucks).
* Rewrite the whole thing to make it less 2003 ish.
Merge branch 'master' of github.com:fdv/publify
Adds more consistency to the UI when Twitter is not configured yet.

Now I belive <del>I can fly</del> we're almost ready for a release.
Merge pull request #214 from gpsnail/master

Translation issue on French
Merge pull request #216 from tboeckmann/patch-2

Update search.html.erb
i18n fixes

Conflicts:
	Gemfile
	themes/zbootstrap/views/articles/_comment_form.html.erb
	themes/zbootstrap/views/layouts/default.html.slim
Merge remote-tracking branch 'upstream/master'