rollback due to migration error
changes from pull
WIP
pulled files
fixed merge conflit
updated integration spec files due to pull
location testing WIP
merge to branch
factory conflict edited
removed print
Location integration spec GREEN
Search tests via category form tag GREEN
keyword spec WIP
changes from pull
to merge master
search testing merge