Merge branch 'master' of
https://github.com/OmniDebt/OmniDebt-Android.git

Conflicts:
	src/org/omnidebt/client/view/DashboardFragment.java
	src/org/omnidebt/client/view/Debt.java
Merge branch 'dashboard' of github.com:OmniDebt/OmniDebt-Android into dashboard
Merge branch 'master' into contact
Merge branch 'dashboard' into contact