Merge branches 'HEAD' and 'master' into dev
preventing endless loop
4 to 6 New & update
adding ...
links newsUpdate more whitespace
with previous
newsUpdate not allcaps
changing slide show
Revert "changing slide show"

This reverts commit 108053026060444bbbc95d23795f9e08c5efbab0.
try slide show fix again
testing
fix error
fix slide show
changing ignore to include wptouch data
adding wptouch-data
phone support
phone
working on phones site
plugin update
phone