t
repair
DB creation
Merge remote-tracking branch 'origin/master'

Conflicts:
	StudentCashbook/bin/classes/com/example/studentcashbook/R$id.class
	StudentCashbook/bin/classes/com/example/studentcashbook/R$layout.class
	StudentCashbook/bin/classes/com/example/studentcashbook/R$menu.class
	StudentCashbook/bin/classes/com/example/studentcashbook/R$string.class
	StudentCashbook/bin/classes/com/example/studentcashbook/R$style.class
	StudentCashbook/gen/com/example/studentcashbook/R.java