Merge branch 'master' of https://github.com/ekinsigic/Limart

Conflicts:
	AccountDefault.html
	AccountOrderHistory.html
	AccountPassword.html
	AccountProfile.html
	ArtistDetail.html
	Artists.html
	Basket.html
	Listing.html
	OrderCompleted.html