Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/DogDaycare.apk
	bin/classes.dex
	bin/classes/com/tjarita/dogdaycare/AddAnimal.class
	bin/classes/com/tjarita/dogdaycare/AddEmployees.class
	bin/classes/com/tjarita/dogdaycare/DBanimal.class
	bin/classes/com/tjarita/dogdaycare/Entry.class
	bin/classes/com/tjarita/dogdaycare/ListEmployees.class
	bin/classes/com/tjarita/dogdaycare/Pin.class
	bin/classes/com/tjarita/dogdaycare/R$id.class
	bin/classes/com/tjarita/dogdaycare/R$layout.class
	bin/classes/com/tjarita/dogdaycare/R$string.class
	bin/classes/com/tjarita/dogdaycare/R$style.class
	bin/dexedLibs/android-support-v4-6601261808551f641db4e96b9d1e57cf.jar
	bin/resources.ap_
	gen/com/tjarita/dogdaycare/R.java
	res/layout/dbtools_add_animal.xml
	res/values/strings.xml
	src/com/tjarita/dogdaycare/AddAnimal.java
	src/com/tjarita/dogdaycare/AddEmployees.java
	src/com/tjarita/dogdaycare/DBanimal.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/DogDaycare.apk
	bin/classes.dex
	bin/classes/com/tjarita/dogdaycare/AddAnimal.class
	bin/classes/com/tjarita/dogdaycare/AddEmployees.class
	bin/classes/com/tjarita/dogdaycare/DBanimal.class
	bin/classes/com/tjarita/dogdaycare/Entry.class
	bin/classes/com/tjarita/dogdaycare/ListEmployees.class
	bin/classes/com/tjarita/dogdaycare/Pin.class
	bin/classes/com/tjarita/dogdaycare/R$id.class
	bin/classes/com/tjarita/dogdaycare/R$layout.class
	bin/classes/com/tjarita/dogdaycare/R$string.class
	bin/classes/com/tjarita/dogdaycare/R$style.class
	bin/dexedLibs/android-support-v4-6601261808551f641db4e96b9d1e57cf.jar
	bin/resources.ap_
	gen/com/tjarita/dogdaycare/R.java
	res/layout/dbtools_add_animal.xml
	res/values/strings.xml
	src/com/tjarita/dogdaycare/AddAnimal.java
	src/com/tjarita/dogdaycare/AddEmployees.java
	src/com/tjarita/dogdaycare/DBanimal.java