Moved a bunch of layout values to styles.
Merge branch 'master' of https://github.com/cmuellerrr/PEER.git
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