Merge pull request #23 from andreqi/jc

Jc
Merge pull request #24 from andreqi/jc

tambos 13/11
san antonio + short list bug
Merge pull request #25 from andreqi/pre_launch_fix

san antonio + short list bug
display: false
Merge remote-tracking branch 'origin/master' into pre_launch_fix
filter incomplete menu
Merge pull request #26 from andreqi/pre_launch_fix

Pre launch fix
Merge pull request #27 from andreqi/master

update jc