Merge branch 'issue_433' into 'master'

beat/web/algorithms/migrations/0002_auto_20160630_1644.py

beat/web/algorithms/migrations/0003_auto_20160701_1707.py

beat/web/common/models.py

beat/web/databases/migrations/0003_auto_20160704_1316.py

beat/web/databases/migrations/0004_auto_20160701_1707.py

beat/web/databases/models.py

beat/web/dataformats/migrations/0002_auto_20160704_1319.py

beat/web/experiments/migrations/0006_auto_20160630_1644.py

beat/web/experiments/migrations/0006_block_order.py

beat/web/experiments/templates/experiments/view.html

beat/web/libraries/migrations/0002_auto_20160630_1644.py

beat/web/libraries/migrations/0003_auto_20160701_1707.py

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

beat/web/plotters/migrations/0003_auto_20160701_1707.py

beat/web/toolchains/migrations/0002_auto_20160630_1644.py

beat/web/toolchains/migrations/0003_auto_20160701_1707.py

beat/web/utils/management/commands/backup.py

beat/web/utils/management/commands/xdumpdata.py