With modal windows for loading
Merge branch 'master' of https://github.com/sixtop/iot-cinvestav.git

Conflicts:
	IoTDashboard/src/mx/cinvestav/gdl/iot/webpage/client/EpWPData.java
ok