fd
Merge branch 'master' into Valentino

Conflicts:
	src/main/java/ua/com/learninghub/rest/Main.java
Merge remote-tracking branch 'origin/Valentino' into Valentino
add index