default controller deleted
searching for users
dummy comit
dummy commit
pugx is now in ragulan repository
composer.lock
fosuserbundle registration customized
Merge branch 'hafid' of https://github.com/Kuro456/athena into hafid

Conflicts:
	app/config/routing.yml
	src/Ath/UserBundle/Resources/config/routing.yml
adding of fosjsrouting
trying modal form
right form name added
adding ajax to form