gps no longer traces yourself
auto-merging
Merge branch 'master' of https://github.com/MaritalWheat/homebase
Layout and values for the new settings activity
Activity file for new settings
jesus christ fucking what the fuck android piece of shit finally got swipe to back implemented for HomeBaseActivities
(you probably don't want toast with each swipe, huh)
brought proper animation to all activities
holy fuck what the fuck I don't even forward queue + swipe right for forward uwotm8
Merge branch 'master' of https://github.com/MaritalWheat/homebase into settings
Keep up to date on changes
added settings activity
Settings activity files and layout xml, also added reference to and onclick for it from the modules drop down
Implemented the settings activcity and view, integrated into newsfedd and tested, everything should be working... including deletiiung account
Defined and set settings button like the others for the module menu, Added the nessescary intenet actions in settings to make the swiping work, added a comment reminder about setting the lay bigger for adding a module (add actually set the layout)
Refactored the application manager to also treat the parse connection as a singleton, and to extend the Application class
Added backgrounds and stuffs, fixed some scroll bars and updated some keyboard options
Merge pull request #37 from mbiokyle29/settings

Settings
Merge branch 'master' of https://github.com/MaritalWheat/homebase into bug-hunt
pull in changes
Changed some edit text options, to try and make it flow a bit better.... idk what the deal is but somehting funky is up with Done/Next on these ones
Implemented upsert for house users, and checking to keep double entires out
Added a quick field check to ensure blank bills cant get created