Update to backend code
Backend UPDATE
Merge remote-tracking branch 'origin/master'

Conflicts:
	1W.rb
Merge branch 'views'