Merge branch 'master' into program-edit <3
Listing and searching of programs
program manager
Merge branch 'program-edit' of https://github.com/se1-1314/xiast into program-edit