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'
Fix Duplicate items bug for ids with more then 255 characters
add integrated json api
validate offset on item listing
fix json api bug
a few smaller api improvements
update docs
error handling for feeds with wrong link
fix wrong route
don't set servers session timeout
fix cookie lifetime settings
fix main menue styling
improve shortcut code
Create se.ini

Swedish translation file
Merge pull request #232 from andersgd/patch-1

New Swedish language file
readme update
Prepare version 2.5