merge
Merge branch 'master' of https://github.com/goodow/drive-android.git

Conflicts:
	src/main/java/com/goodow/drive/android/activity/LogInActivity.java
merge