Moved welcome views to Wiki resource with proper updates
Merge branch 'develop'