update
Merge branch 'master' of https://github.com/jackey/m_app

Conflicts:
	app/design/frontend/default/default/template/checkout/cart.phtml