Code redirection until Forwarding service is provided with dns provider!
redirection until Forwarding service is provided with dns provider!
Merge branch 'master' of ssh://unleyroadtraders-senapps.rhcloud.com/~/git/unleyroadtraders

Conflicts:
	.htaccess
redirection until Forwarding service is provided with dns provider!
redirection until Forwarding service is provided with dns provider