Fix gradle plugin, add command interfaces
Add base stage class
Merge branch 'develop'

Conflicts:
	gradle/wrapper/gradle-wrapper.properties