Added tomcat plugin to Gradle build
Merge branch 'develop' into branch 'feature/tomcat'

Conflicts:
	build.gradle
Ignoring auto generated files SourceTree creates on merge conflict.
Upgraded to Tomcat 8.
Removed redundant declaration.
Updated Gradle wrapper version to the latest.
Fixing gradle wrapper.

Whoops...
Merge branch 'feature/tomcat' into develop
Tomcat plugin updates...