refactored knowledge of crime fragment to crime activity rather than vice versa
cleaned up files, merging with master