Minor bugs.
Merge branch 'dev' of github.com:tvuillemin/DASBoard into dev