df
Merge branch 'master' of https://github.com/anxsaiyuki/r-web

Conflicts:
	app/assets/javascripts/js/main.js
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
fix