app_renderer 커밋
Merge branch 'master' of https://github.com/chaospace/project_chaospace_angularjs

Conflicts:
	assets/data/partisal/main_project_renderer.html