Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/MiscSorter.php
Merge pull request #3 from DariusIII/dev

Many changes.
Fix for filesize PHP notice
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/MiscSorter.php
Merge branch 'master' into dev
Merge branch 'dev' into dev-sphinx
Merge branch 'dev-sphinx' into dev-newdb
Added Cache, Logger, Logging, Settings and automated config.