Updated gradle and gradle-plugin version.
Updated demo's layout.