Merged master into dashboards2

This commit is contained in:
Dante Loayza
2015-06-11 09:33:45 -04:00
28 changed files with 338 additions and 150 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB