Re_SDK
Merge branch 'master' of https://github.com/kapyar/bikeprotector

Conflicts:
	.idea/workspace.xml
	src/main/webapp/index.jsp
	target/ArtifactId/index.jsp