added num field for athlete on edit event screen
Merge remote-tracking branch 'origin/events-list' into events-list

Conflicts:
	app/scripts/controllers/main.js