add locations and skills to new courses form
fix merge conflicts