[STARTUP] Database: parameters.yml and create-empty-database.sql
Plik wsadowy
DB: bat gitignore
Merge branch '2.2-db' of github.com:gajdaw/symfony-standard

Conflicts:
	.gitignore