Merge remote-tracking branch 'second_repo/master' into revamp

# Conflicts:
#	.gitignore
#	pom.xml

Author: argotri

.gitignore

@@ -2,24 +2,3 @@
 target
 *.iml
 *.classpath
-### Example user template template
-### Example user template
-
-# IntelliJ project files
-.idea
-*.iml
-out
-gen
-### Maven template
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-# https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar
-