x
Merge branch 'master' of https://github.com/Indigerd/Asgard

Conflicts:
	lib/vendor/Asgard/Session/Session.php