Merge branch 'devel'
Replace old variable values with new ones
Merge branch 'devel'
Remove unused stuff
Merge branch 'devel'
Merge origin
Add release config options to build.gradle
Remove unused class. Add location fixings
Fix description for real... I hope
Merge branch 'master' into devel