Merge branch 'local_dev' into local_ff_create_profile_v3
Add entities to SimSoccerForm
Merge remote-tracking branch 'SimSoccer/ff_create_profile_v3' into local_dev