merge.

added a new air quality activity in order to work on the noise pollution, etc.. Currently there are two different versions of the air quality map, THIS IS TEMPORARY.
Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2

Conflicts:
	.classpath
	AndroidManifest.xml
	libs/graphview-3.1.jar
	project.properties
	res/layout/activity_main.xml
	res/values/strings.xml