Merge pull request #18 from hlee/master

relation between user and question
partly Fixed #1
Merge pull request #23 from hlee/master

update rails to latest
Fixed #21
Merge pull request #24 from hlee/master

added comment to model
Fixed #22
Merge pull request #25 from hlee/master

added username and login with username or email
Fixed #19
Merge pull request #27 from hlee/master

display username and login with username
Fixed #26
Merge pull request #29 from hlee/master

display username
Fixed #20
Merge pull request #31 from hlee/master

i18n for display question owner 
Fixed #30 display by i18n
Merge pull request #33 from hlee/master

pry and rspec
Fixed #32
remove rails-i18n
add seed for admin
add default user in question
Merge pull request #35 from hlee/master

fixed bug
Merge pull request #36 from hlee/master

add owner while create question
Merge pull request #37 from hlee/master

For heroku deploy
add answer to the question
add default roles
add default role; tag-permission
Merge branch 'master' of git://github.com/jerry134/web6ey into tag-permission

Conflicts:
	Gemfile
	app/views/questions/_form.html.erb
modify .gitignore
Merge pull request #40 from caok/tag-permission

Tag permission