fixes #106
Merge branch 'master' of git://github.com/SSilence/selfoss.git

Conflicts:
	daos/mysql/Items.php
merge upstream
Merge remote-tracking branch 'upstream/master'
Fixed OPML import for other OPML format (no type or text tags)
Merge pull request #235 from RemyG/master

Fixed OPML import for other formats
readme and version update
Create kickstarter.php

kickstarter.php is a spout for fetching a Kickstarter project update feed
* fix deletion of sources (no longer bad request)
* disable tag click on smartphone
* shortcuts mark/unmark as read and star/unstar also available on closed articles
* fix tag list refresh
* prepare 2.6
try .atom in spout feed.php
Create hu.ini

The 1st version of Hungarian translation for Selfoss.
remove kickstarter.php spout
Merge pull request #1 from SSilence/master

Pull head repository
Added autodiscovery of feeds
Fix keyboard shortcuts

When the function doesn't return false the keypress is passed to the browser
which shouldn't happen.
Plugin - Fetch Fulltext From Instapaper Parser

Get clean content for RSS items from Instapaper. Works much better than readability for many sources.
Merge pull request #248 from Makkes/fix-keybindings

Fix keyboard shortcuts
Merge pull request #239 from sanchomuzax/patch-1

Create hu.ini
Merge pull request #244 from rontu85/master

Added autodiscovery to feed.php