Merge branch 'master' into psuedo_master
changed button on AddFoodActvity
new resources
Merge branch 'master' into psuedo_master

Conflicts:
	bin/Innutrac.apk
	bin/classes.dex
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$4.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity.class
	bin/resources.ap_
Removed the now ignored directory"bin"
Removed the now ignored directory"gen"
merge fix mainactivity
Merge branch 'psuedo_master'

Conflicts:
	bin/Innutrac.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/echo/holographlibrary/R$string.class
	bin/classes/com/echo/holographlibrary/R$style.class
	bin/classes/com/innutrac/poly/innutrac/MainActivity$1.class

bin/classes/com/innutrac/poly/innutrac/MainActivity$DrawerItemClickListe
ner.class
	bin/classes/com/innutrac/poly/innutrac/MainActivity.class
	bin/classes/com/innutrac/poly/innutrac/PieView.class
	bin/classes/com/innutrac/poly/innutrac/R$color.class
	bin/classes/com/innutrac/poly/innutrac/R$dimen.class
	bin/classes/com/innutrac/poly/innutrac/R$integer.class
	bin/classes/com/innutrac/poly/innutrac/R$plurals.class
	bin/classes/com/innutrac/poly/innutrac/R$string.class
	bin/classes/com/innutrac/poly/innutrac/R$style.class
	bin/classes/com/innutrac/poly/innutrac/UserInfoActivity$4.class
	bin/classes/com/innutrac/poly/innutrac/WelcomeMessageActivity.class
	bin/classes/it/gmariotti/cardslib/library/R$color.class
	bin/classes/it/gmariotti/cardslib/library/R$dimen.class
	bin/classes/it/gmariotti/cardslib/library/R$integer.class
	bin/classes/it/gmariotti/cardslib/library/R$plurals.class
	bin/classes/it/gmariotti/cardslib/library/R$string.class
	bin/classes/it/gmariotti/cardslib/library/R$style.class
	bin/resources.ap_
	gen/com/echo/holographlibrary/R.java
	gen/com/innutrac/poly/innutrac/R.java
	gen/it/gmariotti/cardslib/library/R.java