Fixing the form layout for "set up first user"
fix for error when db is not up to date and visitor is initialized
remove globals, use twig in templates to load the user
moving stuff around for working authenticate in 1.6"
updated documentation
Merge pull request #1484 from jadwigo/release/1.6

update to authenticate extension in 1.6
Update readme.md
Updating changes from 'master' branch
Restoring globals.. Why would these be removed?
Temporarily setting all Symfony components to "2.5.2", until the Form Validator issue is in a stable release.
Fixes #1439.

Cannot re-use ids in Backbone. Not sure if this is the best place
to edit this in.
Merge pull request #1552 from xiaohutai/release/1.6-bugfix

Fixes #1439.
Type annotation for code completion
Strict fix for isAllowed()

Conflicts:
	app/src/Bolt/Permissions.php
Strict fix for homepage controller inFrontend.php

Conflicts:
	app/src/Bolt/Controllers/Frontend.php
Revert "Strict fix for isAllowed()"

This reverts commit 873a2143ae4dad0640d15926314c32061a61cb5d.
Fixing merge conflict.
Merge stuff
Resetting composer.json to use the Symfony 2.5.4 components
Removing sample image