p_query
add Mac & update GetPolicy
fix test
update PutPolicy
update fop
travis
update doc
fix
fix conflict