- manually merged in session stuff from the master branch
Merge branch 'history' of github.com:Ondoher/sapphire into history

Conflicts:
	node_modules/memcachedStore.js
- had to handle full path template files