add info component
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts_js/hashtag.js
	app/scripts_js/hashtags.js
	app/scripts_js/main.js
	app/scripts_js/pieChart.js
	app/scripts_js/user.js
	app/scripts_js/users.js
add animation
Merge remote-tracking branch 'origin/master'