Merge pull request #19 from caok/master

update
Merge pull request #20 from caok/master

update
modify styles and fixed some bugs
Merge branch 'master' of https://github.com/xiongbo/EST.INFO into style

Conflicts:
	app/assets/javascripts/entries.js.coffee
Merge branch 'master' of github.com:xiongbo/EST.INFO