Merge branch 'plotters' into 'master'

[plotters/ui/common] Multiple fixes

• StoredContributionManager now delivers ordered json (according to database) => ordered Plotter parameters
• Ordered Plotter parameters
• Reports number added as action tabs for list
• Plotter moved to System Resources
• added space between Reports title and count

See merge request !190 (merged)

beat/web/common/models.py

@@ -45,6 +45,7 @@ from .signals import shared
 import os
 import re
 import simplejson
+from collections import OrderedDict
 
 
 #----------------------------------------------------------
@@ -635,7 +636,7 @@ def set_declaration(instance, value):
 
 
 def get_declaration(instance):
-    return simplejson.loads(storage.get_file_content(instance, 'declaration_file'))
+    return simplejson.loads(storage.get_file_content(instance, 'declaration_file'), object_pairs_hook=OrderedDict)
 
 
 def get_declaration_string(instance):