menu
navigation
+some other shit
Merge
Rebasing
wtf
Merge branch 'master' of https://github.com/cmuellerrr/kadARbra

Conflicts:
	assets/procedures/microbe_analysis.xml
	res/values/strings.xml
	res/values/styles.xml
	src/edu/cmu/hcii/novo/kadarbra/ProcedureActivity.java
	src/edu/cmu/hcii/novo/kadarbra/ProcedureFactory.java
	src/edu/cmu/hcii/novo/kadarbra/page/ExecNotesPage.java
	src/edu/cmu/hcii/novo/kadarbra/page/StepPage.java
	src/edu/cmu/hcii/novo/kadarbra/page/StowagePage.java
	src/edu/cmu/hcii/novo/kadarbra/page/TitlePage.java
	src/edu/cmu/hcii/novo/kadarbra/structure/ExecNote.java
	src/edu/cmu/hcii/novo/kadarbra/structure/Step.java