changed categories drop down to accept multiples
merging
added single page search populate
single page search rendering in json back to ajax
merge
fixed yet another conflict, what is going on???
fixed factory girl bug