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
Updating gitignore