Merge branch 'parameters_with_traits' into diadems

Conflicts:
	setup.py
	timeside/grapher/render_analyzers.py
	timeside/server/models.py
Merge branch 'diadems' of github.com:Parisson/TimeSide into diadems

Conflicts:
	setup.py
	timeside/grapher/render_analyzers.py