4/22/14
Merge remote-tracking branch 'origin/controller' into controller

Conflicts:
	.idea/workspace.xml
	src/com/example/Carduino_CalculatedToast/ControllerFragment.java
jhb
dakota push
Merge remote-tracking branch 'origin/controller' into controller

Conflicts:
	.idea/workspace.xml
	res/drawable-mdpi/bg.png
Merge remote-tracking branch 'origin/controller' into controller

Conflicts:
	.idea/workspace.xml
	res/drawable-mdpi/bg.png