mmm
Merge branch 'master' of https://github.com/kevin06nju/mamypoko

Conflicts:
	static/css/adaptor.iphone.style.css