minor changes
Minor repairs
Merge branch 'dev'
commit
Conflicts:
	micro_blog/app/views/pages/new.html.erb