added the join tables
added the join tables
Merge branch 'master' of https://github.com/fangius/warp

Conflicts:
	WarpSocialNetwork/bin/WarpSocialNetwork/Common/DatabaseManager.class
	WarpSocialNetwork/bin/WarpSocialNetwork/Supporting/DBTest.class
	WarpSocialNetwork/bin/WarpSocialNetwork/Supporting/Fragment.class
	WarpSocialNetwork/db.sqlite
	WarpSocialNetwork/src/WarpSocialNetwork/Supporting/DBTest.java
	WarpSocialNetwork/src/WarpSocialNetwork/Supporting/Fragment.java
	WarpSocialNetwork/src/warp/db/sqljet/SqlJetDatabaseManager.java