Test commit (broken)
Fix crash on startup and crash on button click
Merge remote-tracking branch 'origin/master' into Jordi
Merge remote-tracking branch 'origin/master' into Jordi
Merge remote-tracking branch 'origin/master' into Jordi
Merge remote-tracking branch 'origin/master' into Jordi
Homescreen with tabs (list and profile)
Merge pull request #9 from rightfold/Jordi

Jordi
Merge branch 'Jordi'

Conflicts:
	client/res/layout/main.xml
	client/res/values/strings.xml
	client/src/com/b2/app/Main.java
Merge branch 'master' of github.com:rightfold/app