Moved hard-coded fetch timeout values into config file to allow site-level tuning
Merge branch 'master' into tunable-fetches

Conflicts:
	include/rssfuncs.php
Move tuning settings to different file so config.php isn't overcrowded
by default
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable-fetches
Merge branch 'master' into tunable-fetches
modify dojo rebuild script to remove uncompressed files
remove dojo uncompressed files
feed-holder: remove overflow:hidden
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git
pref-prefs: add help for USER_CSS_THEME
No more "tunables.php" defaults dumped into "functions.php"
Merge pull request #114 from ifireball/tunable-fetches

Allow tuning fetch timeouts from config.php
remove THEME_VERSION_REQUIRED
reduce potential freak agitation
api: add article api hook to getArticle, change parameters passed
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS