Refactoring.
Updated drone.io script.
Updated travis ci config
Updated gradle build
Merge branch 'development'

Conflicts:
	.travis.yml
	drone.sh