Merge branch 'plotterparams_merge' into 'master'

beat/web/common/serializers.py

beat/web/experiments/static/experiments/js/utils.js

beat/web/plotters/admin.py

beat/web/plotters/api.py

beat/web/plotters/api_urls.py

beat/web/plotters/apps.py

beat/web/plotters/migrations/0002_plotter_sample_data.py

beat/web/plotters/migrations/0004_merge.py

beat/web/plotters/models.py

beat/web/plotters/serializers.py

beat/web/plotters/static/plotters/app/app.config.js

beat/web/plotters/static/plotters/app/app.js

...ic/plotters/app/controllers/plotterparameterController.js

...tatic/plotters/app/directives/plotterparameterItemView.js

.../plotters/static/plotters/app/factories/plotterFactory.js

.../static/plotters/app/factories/plotterparameterFactory.js

beat/web/plotters/static/plotters/css/style.css

beat/web/plotters/static/plotters/js/dialogs.js

...lotters/static/plotters/js/new_plotterparameter_dialog.js

...lotterparameters/dialogs/new_plotterparameter_dialog.html