Merge pull request #4 from pumalove/master

Merge
Library

larger text size
Merge branch 'master' of https://github.com/alphez/intelligencesafety

Conflicts:
	intelligenceTest/bin/MainActivity.apk
	intelligenceTest/bin/resources.ap_
commit

commit
Commit

fixes
Commit

fix
commit

commit
commit

commit
login

requires login to access main activity

avslutets camera bringes man rett til mainactivity igjen. Ny fix kommer.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	HeaderListView/bin/headerlistview.jar
	ZBarScannerActivity/bin/zbarscanneractivity.jar
	intelligenceTest/AndroidManifest.xml
	intelligenceTest/bin/AndroidManifest.xml
	intelligenceTest/bin/MainActivity.apk
	intelligenceTest/bin/R.txt
	intelligenceTest/bin/classes.dex
	intelligenceTest/bin/classes/com/example/intelligencetest/MainActivity$1.class
	intelligenceTest/bin/classes/com/example/intelligencetest/MainActivity$DummySectionFragment.class
	intelligenceTest/bin/classes/com/example/intelligencetest/MainActivity$SectionsPagerAdapter.class
	intelligenceTest/bin/classes/com/example/intelligencetest/MainActivity.class
	intelligenceTest/bin/classes/com/example/intelligencetest/R$id.class
	intelligenceTest/bin/classes/com/example/intelligencetest/R$layout.class
	intelligenceTest/bin/classes/com/example/intelligencetest/R$menu.class
	intelligenceTest/bin/classes/com/example/intelligencetest/R$string.class
	intelligenceTest/bin/classes/com/example/intelligencetest/R$style.class
	intelligenceTest/bin/classes/com/example/intelligencetest/chemical/ChemicalActivity.class
	intelligenceTest/bin/classes/com/example/intelligencetest/chemical/data/ChemicalDatasource.class
	intelligenceTest/bin/classes/com/example/intelligencetest/chemical/ui/ShowFirefightingData.class
	intelligenceTest/bin/classes/com/example/intelligencetest/chemical/ui/ShowFirstaidData.class
	intelligenceTest/bin/classes/com/example/intelligencetest/library/Library$DatabaseOperation.class
	intelligenceTest/bin/classes/com/example/intelligencetest/library/Library$LibraryAdapter.class
	intelligenceTest/bin/classes/com/example/intelligencetest/library/Library.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest$DatabaseOperation$1$1.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest$DatabaseOperation$1.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest$DatabaseOperation.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest$MyAdapter.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest$Refresh$1$1.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest$Refresh$1.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest$Refresh.class
	intelligenceTest/bin/classes/com/example/intelligencetest/persons/PersonFragmentTest.class
	intelligenceTest/bin/classes/com/example/scanner/GridMenu$MyAdapter.class
	intelligenceTest/bin/classes/com/example/scanner/GridMenu$MyAdapter2.class
	intelligenceTest/bin/classes/com/example/scanner/GridMenu.class
	intelligenceTest/bin/classes/com/example/scanner/Scan.class
	intelligenceTest/bin/classes/com/example/scanner/ScanActivity.class
	intelligenceTest/bin/dexedLibs/headerlistview-f40f726dda2f228bda4907463c253000.jar
	intelligenceTest/bin/dexedLibs/zbarscanneractivity-7b3d8fa447e92acc33044e2ee6992a4c.jar
	intelligenceTest/bin/resources.ap_
	intelligenceTest/gen/com/example/intelligencetest/R.java
	intelligenceTest/src/com/example/intelligencetest/chemical/data/ChemicalDatasource.java
	intelligenceTest/src/com/example/intelligencetest/persons/PersonFragmentTest.java