...
Merge https://github.com/istibekesi/my-restful-api

Conflicts:
	.idea/workspace.xml
	src/main/java/myrest/MyRestController1.java
	src/main/java/myrest/v1/MyRestController.java
	src/main/java/myrest/v1/MyRestControllerV1.java