merge 31/01/2013 morning
Revert "merge 31/01/2013 morning"

This reverts commit 2d3a228580c8bcec5429cf007aed5414e5f656eb.
add data_v2 and start dashboard_v2
add data_v2 and start dashboard_v2
resolve merge conflict 04/02/13
resolve merge conflict 04/02/13 bis
resolve merge conflict 04/02/13 ter
resolve merge conflict 04/02/13 quatro