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