- ubacen bootstrap bundle, commitujem kako bih merge-ovao sa nenadovom verzijom
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	composer.json
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json

SREDJENE MIGRATIONS SKRIPTE, sada rade od nule do trenutne verzije, no problem (Y)
- dodat twitter bootstrap, commit pre merge-a sa nenadovom verzijom.
dzizs, sve zivo treba da se komituje da bi pull odradio, nista, move along, nothing to see here...
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/config/config.yml
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	web/css/bootstrap.css
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	src/Ates/UserBundle/Resources/views/Profile/show.html.twig
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	src/Ates/UserBundle/Controller/AjaxController.php
Merge branch 'master' of https://github.com/milosnovi/employees_vacations

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	src/Ates/UserBundle/Controller/AdminController.php
	src/Ates/UserBundle/Form/Type/RegistrationFormType.php
	src/Ates/VacationBundle/Controller/DefaultController.php
	src/Ates/VacationBundle/Form/Type/HolidaysType.php
	src/Ates/VacationBundle/Form/Type/VacationRequestType.php
	src/Ates/VacationBundle/Resources/views/Request/anyForm.html.twig
- sada se koristi wthtmltopdf i knp snappy bundle za kreiranje pdf-a
- pdf se kreira na osnovu html template-a pdftemplate.html.twig