add new page
add new and items
Merge branch 'master' of https://github.com/tsuwatch/ma9

Conflicts:
	edison/app/routes.php