Minor changes to folder name
Merge branch 'controller' of https://github.com/combizs/angular into controller

Conflicts:
	egg-tutorial/index.html