Merge branch 'master' of https://github.com/darkonarancic/WeLoveFresh

Conflicts:
	img/demo/b3.jpg

Order status progress