--- Initial Import ---
Standard Symfony 2.5 Installation

(+) webconsOLE/UserBundle
(+) webconsOLE/WarehouseBundle
Merge remote-tracking branch 'origin/master'

Conflicts:
	var/cache/dev/appDevUrlGenerator.php.meta
	var/cache/dev/classes.php
	var/cache/dev/classes.php.meta
	var/cache/dev/profiler/index.csv
	var/cache/dev/twig/01/d9/a43838ca68ec9366eb7ba176d72889da20b9e18741ef69238bcee7f41d7c.php
	var/cache/dev/twig/25/94/3b8e39a15eb9c0140234733785ecd72095987a998f3fd8e2f5b8e2489ad6.php
	var/cache/dev/twig/2d/cc/2af314e0fd995b270916a91b3c352beeafb0baf0fa16a673e9c12acd4b7d.php
	var/cache/dev/twig/34/a6/043bd08268c59a716d503a946f72b675ae2a3379ae5b953454535ee7b323.php
	var/cache/dev/twig/55/94/24c29fcdfb7718a595e301ee154a6fdb02eb2db45be957250277ae59a293.php
	var/cache/dev/twig/64/41/6e6346926c6c5de008a08949d1e287889f4f33285153947b23c530f358b1.php
	var/cache/dev/twig/7b/ae/ad0b49b8890e71380dc637b5b699c52fc3a835fd97c891155bed70998aa1.php
	var/cache/dev/twig/7c/f4/93fb6b2a73fc423292fd8e1b0c99339ce8d598c66ae7a0635f1a85f06ab9.php
	var/cache/dev/twig/7e/9c/50873a8d9f9efa7643c24a29f40370c7ea959925c292a6ad3bec5bc0e218.php
	var/cache/dev/twig/8f/94/c8723e27f900a3e0931884c44df41ad082b7121f0317b269eede3d23867a.php
	var/cache/dev/twig/c5/c7/ce5b71bd1cc42f3805da6343fa6864969260382c88ed2e715521f3b9a2e4.php
	var/cache/dev/twig/e9/37/7594fbe40e29eb6cf71685cdea72ccfcf11aaf533e9fa151bcc182e42534.php
	var/cache/dev/twig/fa/75/44d28ce1be8cc107ba7e923c1ac9d313070ef5c69f1f97711d589351b523.php
	var/logs/dev.log
	var/logs/prod.log