updates from master
Conflicts:
	Bonsai/gen/org/srge/bonsai/R.java
deleted R JAVA OMG
sorting code
Merge branch 'master' into disotell
Please enter the commit message for your changes. Lines starting
name change
Merge remote-tracking branch 'origin/pais'

Conflicts:
	Bonsai/res/layout/activity_card.xml
	Bonsai/src/org/srge/bonsai/CardInfo.java
	Bonsai/src/org/srge/bonsai/DeckInfo.java
	Bonsai/src/org/srge/bonsai/FlashActivity.java
	Bonsai/src/org/srge/bonsai/FlashSectionFragment.java
	Bonsai/src/org/srge/bonsai/RunningInfo.java
	Bonsai/src/org/srge/bonsai/TestingDriver.java
fix