added feedback form and moved welcome pages to main app
fixed row numbers for merge
Merge branch 'dev'
add local sample file
Merge branch 'dev'