no message
Merge branch 'master' of https://github.com/jinyaolin/devart-template

Conflicts:
	project_posts/2014-02-01-Demo Video.md
	project_posts/2014-02-01-Demo_Video.md
	project_posts/2014-02-20-Demo Video.md