Fix disappearing submit button
Merge branch 'master' into more_fixes

Conflicts:
	app/views/users/_expenses_list.html.erb
Fix merge conflict
Merge pull request #133 from mud-turtles-2014/more_fixes

Fix disappearing submit button