Merge pull request #24 from Zichsah/Maria

Moved captions and changed datePicker dialog to calendarView, removed
Resources Page Functioning
Merge pull request #25 from Zichsah/noah

Resources Page Functioning
Removed or suppressed warnings throughout the code.
Merge pull request #26 from Zichsah/noah

Removed or suppressed warnings throughout the code.
Added Comments to Noah's Code
Merge pull request #27 from Zichsah/noah

Added Comments to Noah's Code
small changes to keyspot and resources
Merge pull request #29 from Zichsah/noah

small changes to keyspot and resources
fix merge 1
Merge fix 2
Merge branch 'master' into mergefix
merge fix 3
merge fix 4
Merge pull request #33 from Zichsah/noah

Noah
merge fix 5
Merge pull request #35 from Zichsah/noah

merge fix 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	FRPapp/res/values/strings.xml
	FRPapp/src/phillykeyspots/frpapp/MainActivity.java
fixed merge conflicts
fix6