Added stopInfo Api
Merge pull request #1 from toliuweijing/develop

Added stopInfo Api
Merge branch 'master' into develop2

Conflicts:
	app/controllers/Application.java
	app/parsers/SiriXmlParser.java