ActionBar
Merge branch 'master' of https://github.com/GQNC-IT/FieldBook-0.2

Conflicts:
	FieldBook/gen/com/example/fieldbook/R.java
	FieldBook/project.properties
	FieldBook/res/values/strings.xml