Modified admin sidebar& content style
Merge pull request #6 from railsgirls-taiwan/feature/issue_5

Modified admin sidebar& content style
Merge branch 'develop' into feature/issue_1

Conflicts:
	app/assets/stylesheets/admin.css.scss
Fix merge bug
Fix image upload & add admin role