inital commit
Login Form
Dashboard
Dashboard
Dashboard
Dashboard
Merge branch 'master' into feat-origin

Conflicts:
	.gitignore
	LICENSE
	README.md
	UPGRADE-2.2.md
	UPGRADE-2.3.md
	UPGRADE-2.4.md
	UPGRADE.md
	app/.htaccess
	app/AppCache.php
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/SymfonyRequirements.php
	app/autoload.php
	app/check.php
	app/config/config.yml
	app/config/config_dev.yml
	app/config/config_prod.yml
	app/config/config_test.yml
	app/config/parameters.yml.dist
	app/config/routing.yml
	app/config/routing_dev.yml
	app/config/security.yml
	app/console
	app/phpunit.xml.dist
	composer.json
	composer.lock
	src/.htaccess
	src/SOC/Bundle/SocBundle/Command/ImportCommand.php
	src/SOC/Bundle/SocBundle/Command/ImportCommandExt.php
	src/SOC/Bundle/SocBundle/Controller/DefaultController.php
	src/SOC/Bundle/SocBundle/Controller/PlayerController.php
	src/SOC/Bundle/SocBundle/DependencyInjection/Configuration.php
	src/SOC/Bundle/SocBundle/DependencyInjection/SOCSocExtension.php
	src/SOC/Bundle/SocBundle/Entity/Player.php
	src/SOC/Bundle/SocBundle/Entity/PlayerRepository.php
	src/SOC/Bundle/SocBundle/Form/PlayerType.php
	src/SOC/Bundle/SocBundle/Resources/config/routing.yml
	src/SOC/Bundle/SocBundle/Resources/config/routing/player.yml
	src/SOC/Bundle/SocBundle/Resources/config/services.yml
	src/SOC/Bundle/SocBundle/Resources/views/Default/index.html.twig
	src/SOC/Bundle/SocBundle/Resources/views/Player/edit.html.twig
	src/SOC/Bundle/SocBundle/Resources/views/Player/index.html.twig
	src/SOC/Bundle/SocBundle/Resources/views/Player/new.html.twig
	src/SOC/Bundle/SocBundle/Resources/views/Player/show.html.twig
	src/SOC/Bundle/SocBundle/SOCSocBundle.php
	src/SOC/Bundle/SocBundle/Tests/Controller/DefaultControllerTest.php
	src/SOC/Bundle/SocBundle/Tests/Controller/PlayerControllerTest.php
	web/.htaccess
	web/app.php
	web/app_dev.php
	web/apple-touch-icon.png
	web/assets/player.html
	web/config.php
	web/favicon.ico
	web/js/jquery.js
	web/robots.txt