Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/synthetic.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/synthetic.js
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/r2space/YUKARiWeb
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/synthetic.js
Merge remote-tracking branch 'origin/master'