file upload
file upload embedded in article_edit
Merge branch 'master' into feature/article_uploader

Conflicts:
	config/routes.rb
Merge pull request #14 from Thu-SaaS-CloudComputing/feature/article_uploader

Feature/article uploader