Merge(master/feature-68-dashboard) + conflicts correction + feature-68 test

This branch contains : 

1 a merge of current *benel/Tire-a-part/master* and *benel/Tire-a-part/feature-68-dashboard* with corrections of conflicts etc.

2 feature-68 test 

3 Modif of templates/activity_html.html : 
- add "Compter" button 
- click event on "Exporter" and "Compter" *( $('#id').on('click', function(){}) )*