Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/smartnsoft/hackathon/directenergie/HomeActivity.java