DO NOT MERGE. trying to figure out bootstrap
Fixed DB connection. Can login again. When creating a user you can now either join a residence or create one. Interfaces have been updated.
Merge remote-tracking branch 'origin/BenBranch' into BenBranch

Conflicts:
	app/res/layout/login_page.xml
Fixed DB connection. Can login again. When creating a user you can now either join a residence or create one. Interfaces have been updated.
Fixed DB connection. Can login again. When creating a user you can now either join a residence or create one. Interfaces have been updated.