Fixed bug in menubar
New layout for listview
Search and layout
+fix search in gallery when only 1 beer is showing
+new background
Fixed menu for some states
commit agein
Merge remote-tracking branch 'origin/masterPatrik' into
fixesBeforeGoogle_joakim

Conflicts:
	AndroidApp/src/com/beerdev/androidapp/FragmentManagerActivity.java
Added sort to swipeview
+ Can now sort on name and price
Minimized code for filtering functions
Start on layout updates
Fixed layouts
+ ImputMethodManager is now showing in correct views
New Menu
+Works for all mobiles
Shakefunction done!
Merge remote-tracking branch 'origin/shakeBranch_JonathanAnne' into
fixesBeforeGoogle_joakim

Conflicts:
	AndroidApp/src/com/beerdev/androidapp/FragmentManagerActivity.java
Merge remote-tracking branch 'origin/fixesBeforeGoogle_patrik' into
fixesBeforeGoogle_joakim

Conflicts:
	AndroidApp/src/com/beerdev/androidapp/FragmentManagerActivity.java
Merge remote-tracking branch 'origin/fixesBeforeGoogle_joakim'

Conflicts:
	AndroidApp/src/com/beerdev/androidapp/AboutCategories.java
	AndroidApp/src/com/beerdev/androidapp/AboutKistanFragment.java
	AndroidApp/src/com/beerdev/androidapp/AboutUsFragment.java
	AndroidApp/src/com/beerdev/androidapp/FragmentManagerActivity.java
	AndroidApp/src/com/beerdev/androidapp/ListViewFragment.java
	AndroidApp/src/com/beerdev/androidapp/SwipeViewFragment.java
	slidingmenu_library/bin/slidingmenu_library.jar