add xhr and types to main_form
Merge branch 'master' of github.com:Macj/crossroad
Add "new type on main form" functionality