commit the training bundle
commit to development branch
Merge branch 'development' of https://github.com/hrisproject/hris into development

Conflicts:
	app/AppKernel.php
	app/config/routing.yml
	composer.phar
	src/Hris/RecordsBundle/Controller/RecordController.php
	src/Hris/RecordsBundle/Resources/views/Record/formlist.html.twig
	src/Hris/UserBundle/Menu/MainBuilder.php
	web/css/bootstrap_form_2.css
instance trainers delete dialog