stopmonitor Api built
adds comment
Merge branch 'master' into develop2

Conflicts:
	app/controllers/Application.java
	app/parsers/SiriXmlParser.java
Merge pull request #2 from toliuweijing/develop2

Develop2