fix overwrite of ENCODING var
Merge pull request #668 from ikkez/fix-hive-encoding-var

fix overwrite of ENCODING var
Bug fix: 'with' attribute in <include> tag raise error when no token inside
Merge pull request #675 from xfra35/issue675

Bug fix: 'with' attribute in <include> tag raise error
limit & offset workaround for SQL Server, fixes #671
optimize code
Merge pull request #676 from ikkez/sqlsvr-mapper-limit

limit & offset workaround for SQL Server, fixes #671
Add QUERY to hive
Adjust DEBUG level
Merge branch 'dev' of https://github.com/bcosca/fatfree into dev
'safe' is deprecated
Merge pull request #677 from sn0opy/patch-1

'safe' is deprecated
Exempt E_NOTICE from default error_reporting()
Merge branch 'dev' of https://github.com/bcosca/fatfree into dev
Implement ArrayAccess and magic properties on hive
Cosmetic fixes
Bug fix: Incorrect log entry when SQL query contains a question mark
Optimize code and add FRAGMENT hive variable
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	lib/base.php
	readme.md