Merge remote-tracking branch 'aokp/master' into develop

Conflicts:
	.gitignore
	AndroidManifest.xml
	README
	build.gradle
	gradlew.bat
	res/layout/projects_list.xml
	res/layout/projects_subproject_row.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-de/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/arrays.xml
	res/values/attrs.xml
	res/values/strings.xml
	res/values/themes.xml
	src/com/jbirdvegas/mgerrit/ChangelogFragment.java
	src/com/jbirdvegas/mgerrit/GerritControllerActivity.java
	src/com/jbirdvegas/mgerrit/PatchSetViewerFragment.java
	src/com/jbirdvegas/mgerrit/TheApplication.java
	src/com/jbirdvegas/mgerrit/adapters/GooFileArrayAdapter.java
	src/com/jbirdvegas/mgerrit/adapters/TeamListAdapter.java
	src/com/jbirdvegas/mgerrit/cards/PatchSetChangesCard.java
	src/com/jbirdvegas/mgerrit/database/Changes.java
	src/com/jbirdvegas/mgerrit/database/DBHelper.java
	src/com/jbirdvegas/mgerrit/database/DatabaseFactory.java
	src/com/jbirdvegas/mgerrit/database/FileInfoTable.java
	src/com/jbirdvegas/mgerrit/database/MessageInfo.java
	src/com/jbirdvegas/mgerrit/database/Users.java
	src/com/jbirdvegas/mgerrit/helpers/DBParams.java
	src/com/jbirdvegas/mgerrit/helpers/Tools.java
	src/com/jbirdvegas/mgerrit/listeners/MyTabListener.java
	src/com/jbirdvegas/mgerrit/message/ErrorDuringConnection.java
	src/com/jbirdvegas/mgerrit/message/Finished.java
	src/com/jbirdvegas/mgerrit/objects/FileInfo.java
	src/com/jbirdvegas/mgerrit/objects/GerritURL.java
	src/com/jbirdvegas/mgerrit/tasks/GerritService.java
	src/com/jbirdvegas/mgerrit/views/GerritSearchView.java

Change-Id: I4f0f9dd84f250261c070c226a749872d3a1e27b1