Select trait only available after selecting category, same for languages
readme
Merged master fixed conflict
Merged master fixed conflict
conflict fix