updated
Merge branch 'master' of http://github.com/sharikul/BlogPad