clone of master
Activities integrated
Merge remote-tracking branch 'origin/jessica'

Conflicts:
	gen/com/witch/bluecalculate/R.java
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/witch/bluecalculate/MainActivity.java