Merge pull request #1090 from bnchdrff/user-image-ff-fix

fixes firefox user image disappearance
Fixed further firefox display bugs

See #1090

Conflicts:
	core/client/tpl/settings/user-profile.hbs
Merge pull request #1026 from jenius/master

Remove unneeded info from /user api response
Security improvements

no issue
- added CSRF protection
- changed session handling to express.session
- changed session handling to change session id
- added config property useCookieSession
- added file extension check for /ghost/upload
- removed /ghost/debug/db/reset
Merge pull request #1 from sebgie/security

Security improvements
Remove private data from API

no issue
- added removal to user.browse, posts.read, posts.browse
- fixed removal for user.read
Updating to bookshelf 0.5.7 & knex 0.4.11
Merge pull request #2 from ErisDS/bookshelf-knex-update

Updating to bookshelf 0.5.7 & knex 0.4.11
Merge pull request #4 from sebgie/sec/3

Sec/3
API JSON updates
CSRF for debug screen
Fixes for content screen

fixes #1125

- fixes an error in the console when there are no posts
- resolves the issue whereby content disappears after scroll
Current user data update
Fixing URL-based image uploads on settings screen
Improved error handling

fixes #845

- only returns an error page for get requests, otherwise returns a response
- no more admin menu when not logged in
- no more error message about theme error template
- logWarn is available
Version bump to 0.3.3
Revert sessions to cookieSessions

no issue
- modified sessions to use cookieSession
- set max-age to 12 hrs
- modified logout to delete cookie completely
Merge pull request #5 from sebgie/cookies

Revert sessions to cookieSessions
Merge branch '0.3.3-wip'

Conflicts:
	core/client/views/blog.js
	core/server/api.js
	core/server/views/default.hbs
	package.json