deleted SelectedCategories from database
solved transaction problems after editing names of lists
Merge branch 'work' of https://github.com/nBeebz/ListGet into myworking

Conflicts:
	app/src/main/java/com/example/nav/listget/Activities/ItemActivity.java
Merge branch 'work' of https://github.com/nBeebz/ListGet into myworking

Conflicts:
	app/src/main/java/com/example/nav/listget/Activities/ItemActivity.java
fixed bug
after updating the name of the list, it didn't update the name in itemActivity
Merge branch 'work' of https://github.com/nBeebz/ListGet into nav

Conflicts:
	app/src/main/java/com/example/nav/listget/Activities/ItemActivity.java
	app/src/main/java/com/example/nav/listget/Activities/List.java
Merge branch 'work' of https://github.com/nBeebz/ListGet into nav

Conflicts:
	app/src/main/java/com/example/nav/listget/Activities/ItemActivity.java
	app/src/main/java/com/example/nav/listget/Activities/List.java
Merge branch 'Nav' of https://github.com/nBeebz/ListGet into nav

Conflicts:
	app/src/main/java/com/example/nav/listget/Activities/DisplayTest.java
commit
created AccessObject.java
modified manifest to open from login page
fixed problems with database
added andres's menu
deleted setting icon and edit icon
Merge remote-tracking branch 'remotes/origin/mao2'