Set 1 year limit to tournament end (#20)
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/tournament.js
	views/tournaments_add_view.php