Updated End2End. Added general_settings.xml
Started adding Tests for Directory & Discovery
Merge branch 'dev' of https://github.com/OfficeDev/Office-365-SDK-for-Android into dev