Fixed attribute bug in order update action and updated the rollbar gem version.
Merge branch 'master' of https://github.com/Jellyfishboy/trado into gimsonrobotics

Conflicts:
	db/development.sqlite3