140219
140219
140223
Merge branch 'master' of https://github.com/ncloud/story.amado

Conflicts:
	application/controllers/page.php