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

Conflicts:
	iOS/Pods/Manifest.lock
	iOS/Pods/Pods-resources.sh
	iOS/Pods/Pods.xcconfig
	iOS/Pods/Pods.xcodeproj/project.pbxproj