bug fix
Merge branch 'development' of github.com:cassiuschen/mo into development
add follower and following to users
finish flash system
Merge branch 'development' of https://github.com/cassiuschen/mo into feature/Simditor

Conflicts:
	db/schema.rb
timeline item style
add nprogress and shadow of the topbar
Merge branch 'development' of https://github.com/cassiuschen/mo into feature/Simditor
build up show music page
init articles and comments
remove bad css
mergeerror
mergeerrorcommit2
danmucommit