Merge master
Added content-view class to ng-view