backup 11.08.14"
bkp 29.08.2014
Merge branch 'master' of https://github.com/Archarious/Naturesale_brandnew

Conflicts:
	css/style.css
	js/controller.js
	js/jq.js
	sitemap.xml