Conditional text for submit button of game submission form
Removed type variable from conditional submit button text
Merge branch 'master' of github.com:cvan/galaxy into game-submission

Conflicts:
	src/templates/_macros/game_form.html
Fix indentation
Merge pull request #136 from cvan/game-submission

Conditional text in submit button for game submission form