Shakefunction done!
Merge remote-tracking branch 'origin/shakeBranch_JonathanAnne' into
fixesBeforeGoogle_joakim

Conflicts:
	AndroidApp/src/com/beerdev/androidapp/FragmentManagerActivity.java