ante
ante
ante
hej
Fixat knapparna på MainActivity, nu finns antingen create/join eller active party (ej båda alternativen)
removed last create/join stuff changes, searchbutton is shown when connected to party
name,artist,album and length of a song pushed to parse is now also saved in database
 update
 songlist
antes senaste
antes senaste
Merge branch 'master' into feature/use-our-models

* master:
  antes senaste
  songlist
  update
  name,artist,album and length of a song pushed to parse is now also saved in database
  removed last create/join stuff changes, searchbutton is shown when connected to party
  Fixat knapparna på MainActivity, nu finns antingen create/join eller active party (ej båda alternativen)
  ante
  ante

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>

Conflicts:
	src/se/chalmers/hemmafesten/service/PartyController.java