edit size
Merge branch 'hack_chris' into jui
fix mac select
Merge branch 'hack_chris' into jui