Custom query template method name

Merge remote-tracking branch 'origin/develop' into support_15

# Conflicts:
#	build.gradle

Merge remote-tracking branch 'origin/support_15' into support_14

# Conflicts:
#	build.gradle

Upgrade JDK

Merge remote-tracking branch 'origin/develop' into support_15

Merge remote-tracking branch 'origin/support_15' into support_14

Merge pull request #2 from joutvhu/support_15

Config workflow

Merge remote-tracking branch 'origin/support_15' into support_14

# Conflicts:
#	build.gradle