FIx site issues with wamp
Merge remote-tracking branch 'origin/test'