fix upload
Merge branch 'master' into webserver
Merge branch 'master' into webserver
Add max range for graph plot data
Fix zoom bug
Style graph
Merge branch 'master' into webserver
Quick commit with crammed code
Fix amount of data
Handle several attributes
Merge branch 'webserver' into metamodule

Conflicts:
	core/fields/__init__.py
	core/module.py
Merge branch 'metamodule'

Conflicts:
	core/fields/__init__.py
	core/module.py