Merged with master
Merge branch 'master' into fixing-the-stupid-scaling-problem

Conflicts:
	res/layout/activity_procedure.xml
	res/layout/callout.xml
	res/layout/cycle_note.xml
	res/layout/input.xml
	res/layout/nav_item.xml
	res/layout/nav_item_cycle.xml
	res/layout/reference.xml
	res/layout/stow_note.xml
	res/layout/stow_notes_page.xml
	res/layout/stow_notes_table.xml
	res/layout/table_row.xml
	res/layout/timer.xml
	res/values/styles.xml
	src/edu/cmu/hcii/novo/kadarbra/ViewFactory.java
Merged with master
Merge branch 'fixing-the-stupid-scaling-problem' of https://github.com/cmuellerrr/PEER into fixing-the-stupid-scaling-problem

Conflicts:
	res/layout/activity_procedure.xml
	res/layout/call_ground.xml
	res/layout/callout.xml
	res/layout/reference_video.xml
	res/layout/step_page.xml
	res/values/styles.xml
Merge remote-tracking branch 'origin/master' into
fixing-the-stupid-scaling-problem

Conflicts:
	res/layout/input.xml
	res/layout/preview.xml
	res/layout/timer.xml
	res/values/styles.xml
wtf
Merge branch 'master' into fixing-the-stupid-scaling-problem

Conflicts:
	res/layout/complete_page.xml
	res/layout/cover_page.xml
	res/layout/cycle_marker_page.xml
	res/layout/cycle_note.xml
	res/layout/cycle_select_page.xml
	res/layout/ex_note_overall.xml
	res/layout/ex_notes_page.xml
	res/values/styles.xml
Merge remote-tracking branch 'origin/master' into
fixing-the-stupid-scaling-problem

Conflicts:
	res/layout/preview.xml
	res/values/styles.xml
implemented copy of old table but instead using linear layouts
refactoring of linear layout table names
Merge remote-tracking branch 'origin/master' into fixing-the-stupid-scaling-problem
cycle indicator on steppage changed to repetition
changed scroll thumb to rectangle, changed scrolling to static amount
Merge remote-tracking branch 'origin/master' into fixing-the-stupid-scaling-problem
changed repetition messages on cyclemarkerpage
Re-worked input screen to better fit with how we are doing AR.
Merge branch 'fixing-the-stupid-scaling-problem' of https://github.com/cmuellerrr/PEER.git into fixing-the-stupid-scaling-problem
Updated wording for AR steps
Formatting and comments of .page package
Formatting and comments to the .structure and .util packages.