Part of the issues solved. This issues are listed in github.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mdfserver/templates/mdfserver/river_dynamic.html