Added nagivation to action bar; skeleton of category menu
Added expanding list for category menu with mock data
added Database access for category menu
Merge branch 'database' into category

Conflicts:
	res/values/strings.xml
	src/com/carnnecting/account/Login.java
ignore project.properties
create event UI
code reorganized
Merge branch 'kate' of https://github.com/lushashaka/Carnnecting into kate

Conflicts:
	.gitignore
	AndroidManifest.xml
	res/values/strings.xml
	src/com/carnnecting/account/Login.java
	src/com/carnnecting/event/EventDetail.java
	src/com/carnnecting/home/Home.java
merged with master branch when 4 of us sit together
before merge with master
add camera function to create_event

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/carnnecting/home/Home.java
Finished to add floating button to category detail
Completed to add floating icon on CategoryMenu and check it work
Try to implement floating icon to home
modified create event
A
A
Merge branch 'master' into kate

Conflicts:
	AndroidManifest.xml
	res/layout/activity_favorite.xml
	res/layout/activity_home.xml
	res/values/strings.xml
	src/com/carnnecting/account/Login.java
	src/com/carnnecting/category/CategoryDetail.java
	src/com/carnnecting/category/CategoryMenu.java
	src/com/carnnecting/event/EventDetail.java
	src/com/carnnecting/event/Favorite.java
	src/com/carnnecting/home/Home.java
fixed favorite page intent