include data
Merge branch 'ruichao'

Conflicts:
	.idea/modules.xml
	app/src/main/java/me/wisespend/wisespend/Data/DataCollection.java
	app/src/main/java/me/wisespend/wisespend/Data/Debtor.java
	app/src/main/java/me/wisespend/wisespend/Data/Friend.java
	app/src/main/java/me/wisespend/wisespend/Data/company.java
	app/src/main/java/me/wisespend/wisespend/MainActivity.java
	app/src/main/res/layout/activity_main.xml
Revert "Merge branch 'ruichao'"

This reverts commit 3606693778edbd71832e0db5d2dc9d043206c97e, reversing
changes made to aaef68fd5d7bb64ab3ec548766da8fac9833f071.
Merge branch 'master' of https://github.com/ajwad605/WisespendApp
Added ability to filter for wise spend:// URIs