updating to latest stable version
Removing old column.
Merge branch 'new-variables' into production

Conflicts:
	location.rb