fix
Merge branch 'master' of https://github.com/ArtemUvarenko/TriolanAccess into fix

Conflicts:
	.metadata/.bak_0.log
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.indexes/a0/de/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.indexes/e4/54/5e/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/OpenIntercom/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v71/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v71/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.debug.core/.launches/OpenIntercom.launch
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/4110747919.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/OpenIntercom/2014/8/32/refactorings.history
	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/OpenIntercom/2014/8/32/refactorings.index
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	OpenIntercom/AndroidManifest.xml
	OpenIntercom/bin/AndroidManifest.xml
	OpenIntercom/bin/OpenIntercom.apk
	OpenIntercom/bin/R.txt
	OpenIntercom/bin/classes.dex
	OpenIntercom/bin/classes/basiness/logic/AccessActivity.class
	OpenIntercom/bin/classes/basiness/logic/GetAccessFragment.class
	OpenIntercom/bin/classes/basiness/logic/OpenDoor.class
	OpenIntercom/bin/classes/basiness/logic/PageFragment$1.class
	OpenIntercom/bin/classes/basiness/logic/PageFragment.class
	OpenIntercom/bin/classes/basiness/logic/R$id.class
	OpenIntercom/bin/classes/basiness/logic/R$integer.class
	OpenIntercom/bin/classes/basiness/logic/R$layout.class
	OpenIntercom/bin/classes/basiness/logic/R$menu.class
	OpenIntercom/bin/classes/basiness/logic/R$string.class
	OpenIntercom/bin/classes/basiness/logic/R$style.class
	OpenIntercom/bin/classes/basiness/logic/R$styleable.class
	OpenIntercom/bin/classes/basiness/logic/Settings$1.class
	OpenIntercom/bin/classes/basiness/logic/Settings$2.class
	OpenIntercom/bin/classes/basiness/logic/Settings$3.class
	OpenIntercom/bin/classes/basiness/logic/Settings$4.class
	OpenIntercom/bin/classes/basiness/logic/Settings.class
	OpenIntercom/bin/classes/model/User.class
	OpenIntercom/bin/dexedLibs/appcompat_v71-5bc621fa9aad1761e58e21de963790d9.jar
	OpenIntercom/bin/jarlist.cache
	OpenIntercom/bin/resources.ap_
	OpenIntercom/gen/basiness/logic/R.java
	OpenIntercom/res/layout/access_activity.xml
	OpenIntercom/res/values/strings.xml
	OpenIntercom/src/basiness/logic/AccessActivity.java
	OpenIntercom/src/basiness/logic/GetAccessFragment.java
	OpenIntercom/src/basiness/logic/MainMenu.java
	OpenIntercom/src/basiness/logic/OpenDoor.java
	OpenIntercom/src/basiness/logic/PageFragment.java
	OpenIntercom/src/basiness/logic/Settings.java
	OpenIntercom/src/model/User.java
	appcompat_v71/bin/appcompat_v71.jar
fix3