fixed date-modified,created, added search by location, re-added permission-blocking search
Merged changes
Merge branch 'master' of http://github.com/helenhe/cs3240-f14-team02