added data fixtures, modified doctrine files
modified views
modified controller and views