changes to controllers and views.. Orderin method calls and forms
Merge branch 'master' into forms_work

Conflicts:
	app/views/users/edit.html.erb
	lib/orderin.rb
Merge branch 'forms_work'