Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/smartnsoft/hackathon/directenergie/fragment/SerenityFragment.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml