new sites controller specs, remove admin model spec because of devise
Merge remote-tracking branch 'origin/master'