make sync bring mail
add rake sync task
new json response
fix conflicts