Merge branch 'master' of https://github.com/Justin0530/media

Conflicts:
	app/controllers/MenuController.php
Merge branch 'master' of https://github.com/Justin0530/media

Conflicts:
	app/controllers/MenuController.php