Add Notifications
Merge branch 'master' of https://github.com/romainbiard/direct-energy-hackathon

Conflicts:
	broker-core/src/main/java/com/directenergie/core/model/User.java
	broker-core/src/main/java/com/directenergie/core/repository/UserRepository.java
	broker-core/src/main/java/com/directenergie/core/services/InitService.java
	iOS/Pods/Pods.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/romainbiard/direct-energy-hackathon