Updated buttons, added new assets to change EditTexts when focused
Merge remote-tracking branch 'origin/master' into jason
removed unneccessary methods
put in todo for salesforce update
add toast and actual services list
Merge pull request #133 from calblueprint/scannerredo

Scannerredo
Added ProgressDialog for SearchResults, fixed going back and forth between SearchFragments using the Sidebar
Merge pull request #135 from calblueprint/jason

button styling, progressdialog for search results
changed dialog to dialog fragment, added resources to display prompt
fix fragment recycle bug
Merge branch 'master' of https://github.com/calblueprint/PHC into scannerredo
add documentation for ServiceAlertDialogFragment
Merge pull request #136 from calblueprint/scannerredo

changed dialog to dialog fragment, added resources to display prompt
Merge master + merge conflicts