made changes to the database to add the join table and perform hashing
changed the table from segmented file to staticFile
Merge remote-tracking branch 'origin/master'

Conflicts:
	WarpSocialNetwork/src/WarpSocialNetwork/Common/ContentObject.java
	WarpSocialNetwork/src/WarpSocialNetwork/Common/DatabaseManager.java
	WarpSocialNetwork/src/WarpSocialNetwork/Supporting/DBTest.java
	WarpSocialNetwork/src/WarpSocialNetwork/Supporting/Fragment.java