Can now add other types of collections: scratch, channel and interface
Merge branch 'master' of https://github.com/luongm/ptc_spring13