merge
Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2

Conflicts:
	project.properties