benel/Tire-a-part — pull request #146 by FlorianBruniaux (2014-05-23 15:51:45+00:00)
Title: 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(){}) )*