Update national_fragment.xml
Update in_state_fragment.xml
Merge remote-tracking branch 'FatDinosaur/master'

Conflicts:
	res/layout/in_state_fragment.xml
	res/layout/national_fragment.xml