Merge remote-tracking branch 'origin/SkyPHP3'
added jquery migrate
no message
Page::outputJSON()
Merge pull request #261 from will123195/3.0

Page::outputJSON()
quick fix
working on elapsed
resolve segfault issue, weird conflict between catching pdo exceptions and having memcache.so enabled.
fix
Merge pull request #262 from will123195/3.0

remove unnecessary try catch -- fixes segfault issue
added file log to elapsed
Merge pull request #263 from cjemagid/master

Merge remote-tracking branch 'origin/SkyPHP3'
Merge branch '3.0-beta' of https://github.com/SkyPHP/skyphp into 3.0-beta

Conflicts:
	lib/Sky/functions.inc.php
Merge pull request #249 from cjemagid/3.0-beta

added jquery migrate
Added SkyPHP to the cache key
Merge pull request #264 from cjemagid/3.0-beta

Added SkyPHP to the cache key