Formatting corrections, updates, and injury spinner
Required to commit for merge
Merge branch 'master' of https://github.com/team2studio/pt_assistant

Conflicts:
	PT_Assistant/gen/com/example/pt_assistant/R.java
	PT_Assistant/src/com/example/pt_assistant/AssessmentNotesActivity.java