test
Merge branch 'master' of https://github.com/ronnienv/antTrails

Conflicts:
	views/buyer.tpl
	views/vendor.tpl