Misc market changes
Merge branch 'westerland2' of github.com:ishigu/altis into westerland2