updated TODO
Merge branch 'master' into ckeditor
fixed add_post template and added some static