changes
gitignore
Merge branch 'master' of https://github.com/wiquan/dp-svc

Conflicts:
	src/main/java/com/ayla/datapoint/controller/DatapointSvc.java