uniform if syntax
Update README:
 * Add screenshots
 * Use Mediacrush as a CDN for images to reduce load on sebsauvage.net
 * Improve page layout/sections
 * Reorder list of features
 * Add links to wiki and bug tracker
 * Add proper download links for stable/dev channels
 * Improve copyright/license notice
Add Archive.org integration
 * adds an "archive" link next to permalinks, linking to the last version of the page on archive.org
Merge pull request #43 from nodiscc/archiveorg-integration

Add Archive.org integration
Merge pull request #39 from nodiscc/master

add warning about hostname/cookie storage problems during install
Merge pull request #42 from nodiscc/new-readme

Update README
make archive.org integration optional (ARCHIVE_ORG option, defaults to false)
Merge pull request #51 from nodiscc/optional-archiveorg

make archive.org integration optional (ARCHIVE_ORG option, defaults to false)
use urlencode in tagcloud links
 * prevents unproper escaping of characters like '&'
 * fixes https://github.com/sebsauvage/Shaarli/issues/85
 * fixes https://github.com/shaarli/Shaarli/issues/48
Merge pull request #54 from nodiscc/tagcloud-urlencode

use urlencode in tagcloud links
Merge pull request #59 from tst2005/master

uniform if syntax
Do not add a tag to the search if it's already being searched for
Merge pull request #60 from pikzen/master

Do not add a tag to the search if it's already being searched for.
 * Fixes https://github.com/shaarli/Shaarli/issues/50
 * Fixes https://github.com/sebsauvage/Shaarli/issues/140
add sprites.png (toolbar icons sprite)
 * icons from http://fontawesome.io/, converted to png using http://fa2png.io/
 * Licensed under SIL Open Font License (http://scripts.sil.org/OFL)
 * sprite generated using imagemagick 'convert *.png +append sprites.png'
update COPYING for icons
Toolbar improvements:
 * use sprite icons in toolbar
 * remove "Home" button text (icon only)
 * make ATOM button optional, fixes https://github.com/shaarli/Shaarli/issues/24
  * ATOM button display is now configurable using the SHOW_ATOM variable in index.php or data/options.php (defaults to false)
 * Change "RSS Feed" to "Subscribe" for ease of use
  * Users unfamiliar with RSS will get the meaning of the button, while users familiar with it will recognize the RSS ico
fix partial merge