update wordpress to 3.6
updating plugins
Merge branch 'develop'