Merging with dev.
Added edit links to pages
Merge branch 'dev' of https://github.com/Philebrkr/game_contest_server_jterm into dev

Conflicts:
	app/views/contests/show.html.erb
Merge branch 'add_edit' into dev