Merge "Fixed normal mapping shader for model3d-view control" into devel/master