[xilinx]: Minor changes
[xilinx]: Updated watertank to support an advanced temperatures_mode in which water pumps have a temperature, and updated configuration.js
Redis bug fix
[submarinejs]: Started work on submarinejs]
[submarinejs]: Cleaned up submarine experiment from the old aquarium widgets etc
[submarinejs]: More submarine work
[submarinejs]: More submarinejs work. Now all buttons and UI events are present and somewhat working (on their own - not with weblab)
Merge branch 'master' into submarinejs
[submarinejs]: Implemented weblab commands. Not yet fully tested
[submarinejs]: Added submarinejs experiment to the test database
[submarinejs]: Added submarinejs to sample server config, configuration.js etc
Merge branch 'xilinx_improvements' into submarinejs
[submarinejs]: Minor bug fixes. Preliminary version should now be working fine.
[xilinx]: Fixed some bugs in the new watertank system
Merge branch 'master' of github.com:/weblabdeusto/weblabdeusto into xilinx_improvements
Merge branch 'xilinx_improvements' into submarinejs
Merge pull request #66 from weblabdeusto/xilinx_improvements

Xilinx improvements
Merge branch 'submarinejs'