admin
Merge branch 'master' of https://github.com/mokujin90/madam

Conflicts:
	protected/models/Schedule.php