fixed conflict
Merge remote-tracking branch 'origin/master' into live
Adding site map
Merge remote-tracking branch 'origin/master' into live
Attempting to launch setting

Merge remote-tracking branch 'origin/master' into live

Conflicts:
	gls_landing/settings.py
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live
Merge remote-tracking branch 'origin/master' into live