added bcrypt password
Merge pull request #3 from Walter624/bcrypt

added bcrypt password
security authentication
Added test functions
Merge pull request #4 from Walter624/user_test

Added test functions
Added AWS
updates to security, adds a login form
updates to security.yml
implementing user provider
adds doctrine migrations bundle
Merge pull request #5 from njrD/migrations

Adds doctrine migrations bundle
Merge branch 'master' of https://github.com/njrD/CallMe into security

Conflicts:
	src/CallMe/WebBundle/Entity/User.php
Merge branch 'master' of github.com:Walter624/CallMe into aws

Conflicts:
	composer.json
	composer.lock
fixed the composer lock file
Merge pull request #6 from Walter624/aws

Aws
Merge branch 'master' of github.com:njrD/CallMe into security

Conflicts:
	src/CallMe/WebBundle/Entity/User.php
Merge branch 'security' of https://github.com/accortez/CallMe into security

Conflicts:
	src/CallMe/WebBundle/Entity/User.php
modified login twig file
fixes login issue caused by double hashing the password
code standard fixes