Alert songs
Merge branch 'master' of
https://github.com/smartnsoft/hackathon-direct-energie-2013.git

Conflicts:
	src/com/smartnsoft/hackathon/directenergie/fragment/SerenityFragment.java