refactor code
Merge branch 'dev' of https://github.com/OfficeDev/Office-365-SDK-for-Android into dev