Renamed specs
Merge branch 'develop' into grunt