Merge pull request #2 from jaypoulz/jpCleanup

Jp cleanup
merge conflict
merge conflict
setting up android
Extracted changes for the Android L preview branch
Fixed the merge conflict in this branch as well
pulled androidL branch from upstream
location works for writter again
debugging
fix loc
one loc, sensor manager class
Merge pull request #47 from bdonald25/carousel

Carousel
Merge pull request #46 from bdonald25/fixLoc

Fix Location Bugs
updated version numbers
menu credential manager to credentials
preset now switched field
buttons disappear while scrolling up
constants instead of hardcoded values
adding material design
android 5 toolbar