Add collapse/expand
Merge branch 'master' of https://github.com/warash/muppetshow

Conflicts:
	.idea/workspace.xml
	app/scripts/projects/projects.html
Merge branch 'master' of https://github.com/warash/muppetshow

Conflicts:
	app/scripts/projects/projects.html