first commit
Merge https://github.com/keme686/SmartGrid-JADE