Added JSON parsing, displaying sensor data on map
Merge branch 'master' of https://github.com/tenoritaiga/GoogleMapsV2Test
Fixed some error messages, added new icon for air sensors
Fixed Marker info displays
Better formatting on marker info
Changed project name and related filenames
Updated readme
SmartCityTest2 Project started in Android Studio. Functionality currently includes the ability to type in a message and then click “send.” The system will then display the users message.

Necessary code was included to begin using Google Maps, however, not much more progress was made in that direction.

(Note: Coder must install google play services on android studio in order for it to work.)
Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2

Conflicts:
	.classpath
	.gitignore
	project.properties
	src/com/smartcity/redux/MainActivity.java
	src/com/smartcity/redux/adapters/SensorDataAdapter.java
some changes ….
Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2

Conflicts:
	.classpath
—> using “theirs”