Base login and register feature
Merge remote-tracking branch 'kulasart/master'
some
first commit
entities update
Entities update.Added single user fixture
New patient/user registration demo.
Added UserListener service. Update in Patien registration
Added simple Employee registration
Update based on mcms-baza (Added simple Employee registration)
Base login feature. User,Role,UserRole entities fix
Removed UsersBundle
User, Role, UserRole entities fix.

Base login feature.
Added change password feature for current logged user
Added DashboardBundle.
modification of login.html.twig
Merge branch 'master' of https://github.com/edwardzik/MCMS

Conflicts:
	.gitignore
	app/AppKernel.php
	app/config/routing.yml
	app/config/security.yml
	app/logs/.gitkeep
	app/logs/dev.log
	src/Mcms/DashboardBundle/Resources/doc/index.rst
	src/Mcms/EmployeeBundle/Resources/doc/index.rst
	src/Mcms/UserBundle/Controller/ManageController.php
	src/Mcms/UserBundle/Controller/SecurityController.php
	src/Mcms/UserBundle/DataFixtures/ORM/LoadRoleData.php
	src/Mcms/UserBundle/Entity/Role.php
	src/Mcms/UserBundle/Entity/User.php
	src/Mcms/UserBundle/Entity/UserRole.php
	src/Mcms/UserBundle/Resources/config/services.xml
	web/css/style.css
	web/html/css/style.css
	web/html/main.html
	web/html/users.html
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	app/AppKernel.php
	app/config/routing.yml
	app/config/security.yml
	src/Mcms/UserBundle/Controller/ManageController.php
	src/Mcms/UserBundle/Controller/SecurityController.php
	src/Mcms/UserBundle/DataFixtures/ORM/LoadRoleData.php
	src/Mcms/UserBundle/Entity/Role.php
	src/Mcms/UserBundle/Entity/User.php
	src/Mcms/UserBundle/Entity/UserRole.php
	src/Mcms/UserBundle/Resources/config/services.xml
	src/Mcms/UserBundle/Resources/views/Security/login.html.twig
	web/css/style.css

	modified:   .gitignore
	modified:   app/AppKernel.php
	modified:   app/config/routing.yml
	modified:   app/config/security.yml
	deleted:    app/logs/dev.log
	deleted:    src/Mcms/DashboardBundle/Resources/doc/index.rst
	modified:   src/Mcms/UserBundle/Controller/ManageController.php
	modified:   src/Mcms/UserBundle/Controller/SecurityController.php
	modified:   src/Mcms/UserBundle/DataFixtures/ORM/LoadRoleData.php
	modified:   src/Mcms/UserBundle/Entity/Role.php
	modified:   src/Mcms/UserBundle/Entity/User.php
	modified:   src/Mcms/UserBundle/Entity/UserRole.php
	modified:   src/Mcms/UserBundle/Resources/config/services.xml
	modified:   src/Mcms/UserBundle/Resources/views/Security/login.html.twig
	deleted:    src/Mcms/UsersBundle/Controller/DefaultController.php
	deleted:    src/Mcms/UsersBundle/Controller/SecurityController.php
	deleted:    src/Mcms/UsersBundle/DependencyInjection/Configuration.php
	deleted:    src/Mcms/UsersBundle/DependencyInjection/McmsUsersExtension.php
	deleted:    src/Mcms/UsersBundle/Entity/Role.php
	deleted:    src/Mcms/UsersBundle/Entity/User.php
	deleted:    src/Mcms/UsersBundle/Form/Type/UserType.php
	deleted:    src/Mcms/UsersBundle/McmsUsersBundle.php
	deleted:    src/Mcms/UsersBundle/Resources/config/services.xml
	deleted:    src/Mcms/UsersBundle/Resources/doc/index.rst
	deleted:    src/Mcms/UsersBundle/Resources/translations/messages.fr.xliff
	deleted:    src/Mcms/UsersBundle/Resources/views/Default/index.html.twig
	deleted:    src/Mcms/UsersBundle/Resources/views/Security/login.html.twig
	deleted:    src/Mcms/UsersBundle/Resources/views/Security/register.html.twig
	deleted:    src/Mcms/UsersBundle/Resources/views/layout.html.twig
	deleted:    src/Mcms/UsersBundle/Tests/Controller/DefaultControllerTest.php
	modified:   web/css/style.css
	src/Mcms/DashboardBundle/Resources/doc/
	src/Mcms/EmployeeBundle/Resources/doc/