Removed development.log and tmp/pids/server.pid from git tracking
Removed tmp/pids/server.pid from git tracking
Merge branch 'master' into EC-branch1
Streamlined home page product area, footer. Work still required on header.