Removed build folder
Removed unnecessary files
Re-added gradle
Merge branch 'dev-branch'