refactor database.yml
fix something
refactor tag
add edit for tags
Merge branch 'master' of git://github.com/jerry134/web6ey

Conflicts:
	app/models/tag.rb
Merge pull request #114 from hlee/master

feature of adding answer and answer rate
Fixed #97
Merge pull request #113 from caok/master

refactor tag Fixed #103
Merge pull request #115 from hlee/master

#97 again for user count
assets for heroku
remove assets
refact the name of the helper