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

Conflicts:
	.classpath