Fixed user columns input and display.
Ignore gemfile.lock
Merge branch '0926-fix-user-fields'

Conflicts:
	Timeboard-web/Gemfile.lock